mabaoyi 8 月之前
父節點
當前提交
569b76a6dc
共有 77 個文件被更改,包括 4179 次插入3508 次删除
  1. 318 227
      pageC/applicationRefund/applicationRefund.vue
  2. 84 0
      pageC/mineComponent/agreePopup.vue
  3. 259 229
      pageC/myPackage/component/packageCard.vue
  4. 182 140
      pageC/myPackage/myPackage.vue
  5. 250 222
      pageC/orderForm/component/refundCard.vue
  6. 64 29
      pageC/orderForm/orderForm.vue
  7. 247 223
      pageC/orderFormDetail/component/commodityDetail.vue
  8. 378 252
      pageC/orderFormDetail/orderFormDetail.vue
  9. 66 58
      pageC/refundDetail/component/refundInProgress.vue
  10. 249 243
      pageC/refundDetail/component/refundInformation.vue
  11. 114 49
      pageC/refundDetail/refundDetail.vue
  12. 2 4
      pageD/afterSalesDetail/afterSalesDetail.vue
  13. 0 73
      pageD/afterSalesDetail/component/agreePopup.vue
  14. 22 11
      pageD/commodityManage/commodityManage.vue
  15. 1 1
      pageD/commodityManage/component/goodsInformation.vue
  16. 84 0
      pageD/components/agreePopup.vue
  17. 518 472
      pageD/orderInformation/orderInformation.vue
  18. 33 10
      pageD/productDetails/productDetails.vue
  19. 124 98
      pages/mine/component/mallOrderForm.vue
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/index.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/index.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/index.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageD/index.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map
  48. 21 22
      unpackage/dist/dev/mp-weixin/common/main.js
  49. 0 0
      unpackage/dist/dev/mp-weixin/common/runtime.js
  50. 354 315
      unpackage/dist/dev/mp-weixin/common/vendor.js
  51. 31 32
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js
  52. 29 29
      unpackage/dist/dev/mp-weixin/pageA/index.js
  53. 29 29
      unpackage/dist/dev/mp-weixin/pageB/index.js
  54. 29 29
      unpackage/dist/dev/mp-weixin/pageC/index.js
  55. 29 29
      unpackage/dist/dev/mp-weixin/pageD/index.js
  56. 32 33
      unpackage/dist/dev/mp-weixin/pages/cart/cart.js
  57. 32 33
      unpackage/dist/dev/mp-weixin/pages/express/express.js
  58. 0 0
      unpackage/dist/dev/mp-weixin/pages/express/express.wxml
  59. 32 33
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  60. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  61. 32 33
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  62. 32 33
      unpackage/dist/dev/mp-weixin/pages/mine/mine.js
  63. 32 33
      unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js
  64. 29 30
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js
  65. 29 30
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js
  66. 29 30
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js
  67. 29 30
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js
  68. 39 40
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js
  69. 30 31
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js
  70. 39 40
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js
  71. 39 40
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js
  72. 29 30
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.js
  73. 39 40
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
  74. 31 32
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js
  75. 39 40
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js
  76. 40 41
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js
  77. 29 30
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.js

+ 318 - 227
pageC/applicationRefund/applicationRefund.vue

@@ -1,234 +1,325 @@
 <template>
-	<view class="page">
-		<view class="commodity-information">
-			<view class="commodity-1">
-				<image class="commodity-img"
-					src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
-					mode=""></image>
-				<view class="commodity-right">
-					<view class="commodity-2">
-						<view class="commodity-title">
-							OATLY 噢麦力 醇香燕麦…
-						</view>
-
-					</view>
-
-					<view class="commodity-3">
-						<view class="specifications">
-							【醇香】250ml*3
-						</view>
-						<view style="font-size: 24rpx;">
-							x1
-						</view>
-					</view>
-					<view class="commodity-price">
-						<text style="font-size: 20rpx;">¥</text>
-						<text>133</text>.
-						<text style="font-size: 20rpx;">22</text>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="reason">
-			<view class="application-reason">
-				<view class="">
-					申请原因
-				</view>
-				<view class="right" @click="openReason">
-					<text>{{refundText}}</text>
-					<image class="right-icon" src="../../static/mine/325.png" mode=""></image>
-				</view>
-			</view>
-
-			<view class="application-reason">
-				<view class="">
-					退款金额
-				</view>
-				<view class="commodity-price">
-					<text style="font-size: 20rpx;">¥</text>
-					<text>133</text>.
-					<text style="font-size: 20rpx;">22</text>
-				</view>
-			</view>
-		</view>
-		
-		<view class="application-explain">
-			<view class="application-title">
-				申请说明
-			</view>
-			<view class="textarea">
-				<u--textarea v-model="value1" border="none"  placeholder="请您详细填写申请说明" ></u--textarea>
-			
-			<u-upload
-				:fileList="fileList6"
-				@afterRead="afterRead"
-				@delete="deletePic"
-				name="6"
-				multiple
-				:maxCount="1"
-				width="250"
-				height="150"
-			>
-				
-				<view class="unload">
-					<view class="text-content">
-						上传凭证<br/>(最多9张)
-					</view>
-					
-				</view>
-			</u-upload>
-			</view>
-		</view>
-		<reasonPopupVue :show="show" @close="close"></reasonPopupVue>
-	</view>
+  <view class="page">
+    <view class="commodity-information">
+      <view class="commodity-1">
+        <image
+          class="commodity-img"
+          :src="goodsDetail.goods.goods_image"
+          mode=""
+        ></image>
+        <view class="commodity-right">
+          <view class="commodity-2">
+            <view class="commodity-title"
+              >{{ goodsDetail.goods.goods_name }}
+            </view>
+          </view>
+
+          <view class="commodity-3">
+            <view class="specifications">
+              {{ goodsDetail.goods.sku_item.item }}
+            </view>
+            <view style="font-size: 24rpx">
+              x{{ goodsDetail.goods.goods_num }}
+            </view>
+          </view>
+          <view class="commodity-price" v-if="goodsDetail.goods">
+            <text style="font-size: 20rpx">¥</text>
+            <text>{{ goodsDetail.goods.unit_price.split(".")[0] }}</text
+            >.
+            <text style="font-size: 20rpx">{{
+              goodsDetail.goods.unit_price.split(".")[1]
+            }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="reason">
+      <view class="application-reason">
+        <view class=""> 申请原因 </view>
+        <view class="right" @click="openReason">
+          <text>{{ refundText }}</text>
+          <image
+            class="right-icon"
+            src="../../static/mine/325.png"
+            mode=""
+          ></image>
+        </view>
+      </view>
+
+      <view class="application-reason">
+        <view class=""> 退款金额 </view>
+        <view
+          class="commodity-price"
+          style="font-weight: 600"
+          v-if="goodsDetail.goods"
+        >
+          <text style="font-size: 20rpx">¥</text>
+          <text>{{ goodsDetail.goods.amount.split(".")[0] }}</text
+          >.
+          <text style="font-size: 20rpx">{{
+            goodsDetail.goods.amount.split(".")[1]
+          }}</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="application-explain">
+      <view class="application-title"> 申请说明 </view>
+      <view class="textarea">
+        <u--textarea
+          v-model="value1"
+          border="none"
+          placeholder="请您详细填写申请说明"
+        ></u--textarea>
+
+        <u-upload
+          :fileList="fileList6"
+          @afterRead="afterRead"
+          @delete="deletePic"
+          name="6"
+          multiple
+          :maxCount="1"
+          width="250"
+          height="150"
+        >
+          <view class="unload">
+            <view class="text-content"> 上传凭证<br />(最多9张) </view>
+          </view>
+        </u-upload>
+      </view>
+      <view class="img-list">
+        <image
+          v-for="(item, index) in imgList"
+          :src="item"
+          :key="index"
+          mode="scaleToFill"
+          class="upload-img"
+        />
+      </view>
+    </view>
+    <reasonPopupVue :show="show" @close="close"></reasonPopupVue>
+
+    <view class="footer">
+      <button class="btn" @click="submitApplication">提交申请</button>
+    </view>
+  </view>
 </template>
 
 <script>
-	import reasonPopupVue from './component/reasonPopup.vue';
-	export default {
-		components: {
-			reasonPopupVue
-		},
-		data() {
-			return {
-				show: false,
-				value1:"",
-				refundText:"请选择退款原因"
-			};
-		},
-		methods: {
-			openReason() {
-				this.show = true
-			},
-			close(value) {
-				console.log(value)
-				this.refundText = value
-				this.show = false
-			}
-		},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title:"申请退款"
-			})
-		}
-	}
+import reasonPopupVue from "./component/reasonPopup.vue";
+export default {
+  components: {
+    reasonPopupVue,
+  },
+  data() {
+    return {
+      show: false,
+      value1: "",
+      refundText: "请选择退款原因",
+      orderId: "",
+      goodsDetail: {},
+      imgList: [],
+    };
+  },
+  onLoad(options) {
+    this.orderId = options.orderId;
+  },
+  methods: {
+    //打开退货理由弹窗
+    openReason() {
+      this.show = true;
+    },
+
+    //关闭弹窗
+    close(value) {
+      this.refundText = value;
+      this.show = false;
+    },
+
+    //上传图片
+    afterRead(e) {
+      console.log(e);
+      this.imgList.push(e.file[0].url);
+    },
+
+    //获取订单商品信息
+    getDetail() {
+      uni.$u.http
+        .post(`/api/order/order_goods_details`, {
+          order_goods_id: this.orderId,
+        })
+        .then((res) => {
+          this.goodsDetail = res;
+        });
+    },
+
+    //提交申请
+    submitApplication() {
+      uni.$u.http
+        .post(`/api/order/refund`, {
+          order_id: this.goodsDetail.id,
+          order_goods_id: this.orderId,
+          refund_reason: this.refundText,
+          refund_illustrate: this.value1,
+          image: this.imgList.join(","),
+        })
+        .then((res) => {
+          console.log(res);
+        });
+    },
+  },
+  mounted() {
+    this.getDetail();
+    uni.setNavigationBarTitle({
+      title: "申请退款",
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		padding: 20rpx 24rpx;
-
-		.commodity-information {
-			padding: 28rpx 20rpx;
-			background-color: #fff;
-			border-radius: 16rpx;
-
-			.commodity-1 {
-				display: flex;
-
-				.commodity-img {
-					width: 156rpx;
-					height: 156rpx;
-					margin-right: 20rpx;
-					border-radius: 10rpx;
-				}
-
-				.commodity-right {
-					width: 73%;
-				}
-
-				.commodity-2 {
-					display: flex;
-					justify-content: space-between;
-					width: 100%;
-
-					.commodity-title {
-						width: 328rpx;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						margin-right: 38rpx;
-					}
-				}
-
-				.commodity-3 {
-					display: flex;
-					justify-content: space-between;
-					margin-top: 20rpx;
-					color: #777;
-
-					.specifications {
-						font-size: 28rpx;
-						color: #777;
-					}
-				}
-
-				.commodity-price {
-					margin-top: 24rpx;
-					font-weight: 600;
-				}
-			}
-		}
-
-		.reason {
-			background-color: #fff;
-			padding: 0 20rpx;
-			border-radius: 16rpx;
-			margin-top: 20rpx;
-
-			.application-reason {
-				display: flex;
-				justify-content: space-between;
-				height: 104rpx;
-				align-items: center;
-				font-size: 28rpx;
-
-				.right {
-					display: flex;
-					align-items: center;
-					color: rgba(34, 34, 34, .6);
-					font-size: 28rpx;
-				}
-
-				.right-icon {
-					width: 32rpx;
-					height: 32rpx;
-				}
-			}
-
-		}
-		.application-explain{
-			margin-top: 20rpx;
-			padding: 28rpx 20rpx;
-			background-color: #fff;
-			border-radius: 16rpx;
-			.application-title{
-				font-size: 28rpx;
-				color: #222;
-				margin-bottom: 18rpx;
-			}
-			.textarea{
-				background-color: #f4f4f4;
-				padding: 24rpx;
-				border-radius: 16rpx;
-			}
-			.unload{
-				width: 614rpx;
-				height: 152rpx;
-				text-align: center;
-				border-radius: 16rpx;
-				color: #929292;
-				border: 2rpx dashed #979797;
-				font-size: 20rpx;
-				.text-content{
-					margin-top: 80rpx;
-				}
-			}
-		}
-	}
-	.u-textarea{
-		background-color: #f4f4f4;
-		padding: 0;
-	}
-</style>
+.page {
+  padding: 20rpx 24rpx;
+  position: relative;
+  .commodity-information {
+    padding: 28rpx 20rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+
+    .commodity-1 {
+      display: flex;
+
+      .commodity-img {
+        width: 156rpx;
+        height: 156rpx;
+        margin-right: 20rpx;
+        border-radius: 10rpx;
+      }
+
+      .commodity-right {
+        width: 73%;
+      }
+
+      .commodity-2 {
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+
+        .commodity-title {
+          width: 328rpx;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          margin-right: 38rpx;
+        }
+      }
+
+      .commodity-3 {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 20rpx;
+        color: #777;
+
+        .specifications {
+          font-size: 28rpx;
+          color: #777;
+        }
+      }
+
+      .commodity-price {
+        margin-top: 24rpx;
+        font-weight: 600;
+      }
+    }
+  }
+
+  .reason {
+    background-color: #fff;
+    padding: 0 20rpx;
+    border-radius: 16rpx;
+    margin-top: 20rpx;
+
+    .application-reason {
+      display: flex;
+      justify-content: space-between;
+      height: 104rpx;
+      align-items: center;
+      font-size: 28rpx;
+
+      .right {
+        display: flex;
+        align-items: center;
+        color: rgba(34, 34, 34, 0.6);
+        font-size: 28rpx;
+      }
+
+      .right-icon {
+        width: 32rpx;
+        height: 32rpx;
+      }
+    }
+  }
+  .application-explain {
+    margin-top: 20rpx;
+    padding: 28rpx 20rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+    .application-title {
+      font-size: 28rpx;
+      color: #222;
+      margin-bottom: 18rpx;
+    }
+    .textarea {
+      background-color: #f4f4f4;
+      padding: 24rpx;
+      border-radius: 16rpx;
+    }
+    .img-list {
+      display: flex;
+      margin-top: 20rpx;
+      flex-wrap: wrap;
+      .upload-img {
+        width: 186rpx;
+        height: 186rpx;
+        border-radius: 16rpx;
+        margin-right: 20rpx;
+      }
+    }
+    .unload {
+      width: 614rpx;
+      height: 152rpx;
+      text-align: center;
+      border-radius: 16rpx;
+      color: #929292;
+      border: 2rpx dashed #979797;
+      font-size: 20rpx;
+      .text-content {
+        margin-top: 80rpx;
+      }
+    }
+  }
+  .footer {
+    position: fixed;
+    bottom: 0;
+    padding: 20rpx 24rpx 60rpx;
+    background-color: #fff;
+    left: 0;
+    width: 100%;
+    .btn {
+      margin: 0;
+      padding: 0;
+      background-color: #f83224;
+      color: #fff;
+      border-radius: 44rpx;
+      width: 94%;
+      height: 88rpx;
+      line-height: 88rpx;
+    }
+  }
+}
+.u-textarea {
+  background-color: #f4f4f4;
+  padding: 0;
+}
+</style>

+ 84 - 0
pageC/mineComponent/agreePopup.vue

@@ -0,0 +1,84 @@
+<template>
+  <view>
+    <u-popup
+      :show="agreeShow"
+      @close="$emit('close')"
+      :safeAreaInsetBottom="false"
+      mode="center"
+      round="10"
+    >
+      <view class="popup-content">
+        <view class="title"> {{ title }} </view>
+        <view class="btn-list">
+          <button class="btn-2" @click="$emit('close')">取消</button>
+          <button class="btn-1" @click="$emit('close', true)">提交</button>
+        </view>
+      </view>
+    </u-popup>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    agreeShow: {
+      typeof: Boolean,
+      default: false,
+    },
+    title: {
+      typeof: String,
+      default: "",
+    },
+  },
+  watch: {
+    agreeShow() {
+      console.log(111);
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.popup-content {
+  padding: 36rpx 28rpx;
+  width: 450rpx;
+  .title {
+    font-size: 32rpx;
+    color: #333;
+    font-weight: 600;
+    text-align: center;
+    margin-bottom: 28rpx;
+  }
+  .btn-list {
+    display: flex;
+    justify-content: space-around;
+    .btn-1 {
+      background-color: #f83224;
+      color: #fff;
+      margin-top: 40rpx;
+      border-radius: 38rpx;
+      margin: 0;
+      width: 188rpx;
+      height: 76rpx;
+      line-height: 76rpx;
+      font-size: 32rpx;
+    }
+
+    .btn-2 {
+      background-color: #fff;
+      color: #f83224;
+      margin-top: 40rpx;
+      border-radius: 38rpx;
+      border: 2rpx solid #f83224;
+      margin: 0;
+      width: 188rpx;
+      height: 76rpx;
+      line-height: 76rpx;
+      font-size: 32rpx;
+    }
+  }
+}
+</style>

+ 259 - 229
pageC/myPackage/component/packageCard.vue

@@ -1,236 +1,266 @@
 <template>
-	<view class="card" @click="$emit('toInformation',itemInfo.orderStatus)">
-		<view class="top-detail">
-			<view class="top-left">
-				<view class="_label-1" v-if="itemInfo.labelStatus == 0">
-					平台自购
-				</view>
-				<view class="_label-2" v-if="itemInfo.labelStatus == 1">
-					自寄
-				</view>
-				<view class="order-num">
-					<text>订单编号:</text>
-					<text>4873221093105892</text>
-				</view>
-			</view>
-			<view class="top-right">
-				{{orderDetail}}
-			</view>
-		</view>
-		<view class="content-center">
-			<view class="center-left-right">
-				<view class="address">
-					上海市
-				</view>
-				<view class="name">
-					陈盼盼
-				</view>
-			</view>
-			<image class="arrow" src="../../../static/mine/337.png" mode=""></image>
-			<view class="center-left-right">
-				<view class="address">
-					洛杉矶
-				</view>
-				<view class="name">
-					Curtis Morris
-				</view>
-			</view>
-		</view>
-		<view class="price" v-if="itemInfo.orderStatus == 1">
-			<text style="font-size: 24rpx;color: #333;">合计</text>
-			<view style="color: #f83224;font-weight: 600;">
-				<text style="font-size: 20rpx;">¥</text>
-				<text>133</text>.
-				<text style="font-size: 20rpx;">22</text>
-			</view>
-		</view>
-		<view class="card-bottom">
-			<view class="package-weight">
-				<text>包裹重量:</text>
-				<text>45kg</text>
-			</view>
-			<view class="btn-list">
-				<button class="btn-2" v-show="itemInfo.orderStatus!=4&&itemInfo.orderStatus!=3" @click.stop="freeze">冻结</button>
-				<button class="btn-2" v-show="itemInfo.orderStatus != 1&&itemInfo.orderStatus!=4" @click.stop="$emit('toInformation',itemInfo.orderStatus)">查看详情</button>
-				<button class="btn-1" v-show="itemInfo.orderStatus == 1" @click.stop="toPayment">立即付款</button>
-				<button class="btn-1" @click.stop="toSending" v-show="itemInfo.orderStatus == 4">去寄件</button>
-			</view>
-		</view>
-	</view>
+  <view class="card" @click="$emit('toInformation', itemInfo)">
+    <view class="top-detail">
+      <view class="top-left">
+        <view class="_label-1" v-if="itemInfo.mall_order_id >= 0">
+          平台自购
+        </view>
+        <view class="_label-2" v-if="itemInfo.labelStatus == 0"> 自寄 </view>
+        <view class="order-num">
+          <text>订单编号:</text>
+          <text>{{ itemInfo.order_no }}</text>
+        </view>
+      </view>
+      <view class="top-right">
+        {{ itemInfo.status_text }}
+      </view>
+    </view>
+    <view class="content-center">
+      <view class="center-left-right">
+        <view class="address"> {{ itemInfo.from_province_name }} </view>
+        <view class="name"> {{ itemInfo.from_name }} </view>
+      </view>
+      <image class="arrow" src="../../../static/mine/337.png" mode=""></image>
+      <view class="center-left-right">
+        <view class="address"> {{ itemInfo.to_province_name }} </view>
+        <view class="name"> {{ itemInfo.to_name }} </view>
+      </view>
+    </view>
+    <view class="price" v-if="itemInfo.status == 'unpaid'">
+      <text style="font-size: 24rpx; color: #333">合计</text>
+      <view style="color: #f83224; font-weight: 600">
+        <text style="font-size: 20rpx">¥</text>
+        <text>{{ itemInfo.actual_price.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          itemInfo.actual_price.split(".")[1]
+        }}</text>
+      </view>
+    </view>
+    <view class="card-bottom">
+      <view class="package-weight">
+        <text>包裹重量:</text>
+        <text>{{ Number(itemInfo.actual_weight) }}kg</text>
+      </view>
+      <view class="btn-list">
+        <button
+          class="btn-2"
+          v-show="
+            itemInfo.status == 'domestic_delivered' ||
+            itemInfo.status == 'domestic_received'
+          "
+          @click.stop="freeze"
+        >
+          {{ itemInfo.is_frozen == 0 ? "冻结" : "恢复" }}
+        </button>
+        <button
+          class="btn-2"
+          v-show="
+            itemInfo.status == 'domestic_delivered' ||
+            itemInfo.status == 'overseas_undelivered' ||
+            itemInfo.status == 'overseas_delivered'
+          "
+          @click.stop="$emit('toInformation', itemInfo)"
+        >
+          查看详情
+        </button>
+        <button
+          class="btn-1"
+          v-show="itemInfo.status == 'unpaid'"
+          @click.stop="toPayment"
+        >
+          立即付款
+        </button>
+        <button
+          class="btn-1"
+          @click.stop="toSending"
+          v-show="itemInfo.status == 'domestic_undelivered'"
+        >
+          去寄件
+        </button>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		props: {
-			itemInfo: {
-				typeof: Object,
-				default: {}
-			}
-		},
-		computed: {
-			orderDetail() {
-				if (this.itemInfo.orderStatus == 0) {
-					return "待平台收货"
-				} else if (this.itemInfo.orderStatus == 1) {
-					return "待付款"
-				} else if (this.itemInfo.orderStatus == 2) {
-					return "待发货"
-				} else if (this.itemInfo.orderStatus == 3) {
-					return "拼包中"
-				} else if (this.itemInfo.orderStatus == 4) {
-					return "待寄件"
-				}
-			}
-		},
-		data() {
-			return {
-
-			}
-		},
-		methods:{
-			freeze(){},
-			toPayment(){
-				uni.navigateTo({
-					url:"/pageD/paymentOrder/paymentOrder"
-				})
-			},
-			toSending(){
-				uni.navigateTo({
-					url:"/pageD/sending/sending"
-				})
-			}
-		}
-	}
+export default {
+  props: {
+    itemInfo: {
+      typeof: Object,
+      default: {},
+    },
+  },
+  computed: {
+    orderDetail() {
+      if (this.itemInfo.orderStatus == 0) {
+        return "待平台收货";
+      } else if (this.itemInfo.orderStatus == 1) {
+        return "待付款";
+      } else if (this.itemInfo.orderStatus == 2) {
+        return "待发货";
+      } else if (this.itemInfo.orderStatus == 3) {
+        return "拼包中";
+      } else if (this.itemInfo.orderStatus == 4) {
+        return "待寄件";
+      }
+    },
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    //冻结
+    freeze() {
+      uni.$u.http
+        .post(`/api/express-order/froze/${this.itemInfo.id}`)
+        .then((res) => {
+          uni.showToast({
+            title: this.itemInfo.is_frozen == 0 ? "已冻结" : "已恢复",
+            icon: "none",
+          });
+        });
+    },
+    toPayment() {
+      uni.navigateTo({
+        url: "/pageD/paymentOrder/paymentOrder",
+      });
+    },
+    toSending() {
+      uni.navigateTo({
+        url: "/pageD/sending/sending",
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.card {
-		padding: 28rpx 20rpx 0;
-		background-color: #fff;
-		border-radius: 16rpx;
-		margin-top: 20rpx;
-
-		.top-detail {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			.top-left {
-				display: flex;
-				align-items: center;
-
-				._label-1 {
-					padding: 4rpx 8rpx;
-					background-color: #FF1515;
-					border-radius: 4rpx;
-					color: #fff;
-					font-size: 20rpx;
-					margin-right: 10rpx;
-				}
-
-				._label-2 {
-					padding: 4rpx 8rpx;
-					background-color: #FF6700;
-					border-radius: 4rpx;
-					color: #fff;
-					font-size: 20rpx;
-					margin-right: 10rpx;
-				}
-
-				.order-num {
-					font-size: 26rpx;
-					color: #333333;
-				}
-			}
-
-			.top-right {
-				color: #f83224;
-				font-size: 26rpx;
-			}
-		}
-
-		.content-center {
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			margin-top: 44rpx;
-			margin-bottom: 40rpx;
-
-			.arrow {
-				width: 130rpx;
-				height: 10rpx;
-			}
-
-			.center-left-right {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-
-				.address {
-					font-weight: 600;
-				}
-
-				.name {
-					font-size: 24rpx;
-					color: rgba(34, 34, 34, .7);
-					margin-top: 10rpx;
-				}
-			}
-		}
-
-		.price {
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
-			margin-bottom: 28rpx;
-		}
-
-		.card-bottom {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 30rpx 0 28rpx;
-			border-top: 2rpx solid rgba(151, 151, 151, .2);
-
-			.package-weight {
-				font-size: 26rpx;
-				color: #444444;
-			}
-
-			.btn-list {
-				display: flex;
-
-				.btn-1 {
-					font-size: 28rpx;
-					color: #fff;
-					// border: 2rpx solid #f83224;
-					background-color: #f83224;
-					margin: 0;
-					border-radius: 34rpx;
-					min-width: 132rpx;
-					margin-left: 20rpx;
-					height: 68rpx;
-					line-height: 68rpx;
-				}
-
-				.btn-2 {
-					font-size: 28rpx;
-					color: #222;
-					border: 2rpx solid rgba(151, 151, 151, .7);
-					background-color: #fff;
-					margin: 0;
-					border-radius: 34rpx;
-					padding: 0;
-					min-width: 132rpx;
-					margin-left: 20rpx;
-					padding: 0 20rpx;
-					height: 68rpx;
-					line-height: 68rpx;
-
-				}
-			}
-
-		}
-	}
-</style>
+.card {
+  padding: 28rpx 20rpx 0;
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin-top: 20rpx;
+
+  .top-detail {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .top-left {
+      display: flex;
+      align-items: center;
+
+      ._label-1 {
+        padding: 4rpx 8rpx;
+        background-color: #ff1515;
+        border-radius: 4rpx;
+        color: #fff;
+        font-size: 20rpx;
+        margin-right: 10rpx;
+      }
+
+      ._label-2 {
+        padding: 4rpx 8rpx;
+        background-color: #ff6700;
+        border-radius: 4rpx;
+        color: #fff;
+        font-size: 20rpx;
+        margin-right: 10rpx;
+      }
+
+      .order-num {
+        font-size: 26rpx;
+        color: #333333;
+      }
+    }
+
+    .top-right {
+      color: #f83224;
+      font-size: 26rpx;
+    }
+  }
+
+  .content-center {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    margin-top: 44rpx;
+    margin-bottom: 40rpx;
+
+    .arrow {
+      width: 130rpx;
+      height: 10rpx;
+    }
+
+    .center-left-right {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+
+      .address {
+        font-weight: 600;
+      }
+
+      .name {
+        font-size: 24rpx;
+        color: rgba(34, 34, 34, 0.7);
+        margin-top: 10rpx;
+      }
+    }
+  }
+
+  .price {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    margin-bottom: 28rpx;
+  }
+
+  .card-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx 0 28rpx;
+    border-top: 2rpx solid rgba(151, 151, 151, 0.2);
+
+    .package-weight {
+      font-size: 26rpx;
+      color: #444444;
+    }
+
+    .btn-list {
+      display: flex;
+
+      .btn-1 {
+        font-size: 28rpx;
+        color: #fff;
+        // border: 2rpx solid #f83224;
+        background-color: #f83224;
+        margin: 0;
+        border-radius: 34rpx;
+        min-width: 132rpx;
+        margin-left: 20rpx;
+        height: 68rpx;
+        line-height: 68rpx;
+      }
+
+      .btn-2 {
+        font-size: 28rpx;
+        color: #222;
+        border: 2rpx solid rgba(151, 151, 151, 0.7);
+        background-color: #fff;
+        margin: 0;
+        border-radius: 34rpx;
+        padding: 0;
+        min-width: 132rpx;
+        margin-left: 20rpx;
+        padding: 0 20rpx;
+        height: 68rpx;
+        line-height: 68rpx;
+      }
+    }
+  }
+}
+</style>

+ 182 - 140
pageC/myPackage/myPackage.vue

@@ -1,156 +1,198 @@
 <template>
-	<view>
-		<view class="top-search">
-			<u--input placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle"
-				prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;"></u--input>
-			<view class="top-tab">
-				<view :class="{commodity:follow==1}" class="tab" @click="tabSwitch(1)">
-					发往中转点
-				</view>
-				<view :class="{commodity:follow==2}" class="tab" @click="tabSwitch(2)">
-					中转已签收
-				</view>
-				<view :class="{commodity:follow==3}" class="tab" @click="tabSwitch(3)">
-					正发往海外
-				</view>
-			</view>
+  <view>
+    <view class="top-search">
+      <u--input
+        placeholder="请输入订单编号搜索"
+        prefixIcon="search"
+        shape="circle"
+        v-model="orderId"
+        prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;"
+      ></u--input>
+      <view class="top-tab">
+        <view
+          :class="{ commodity: follow == 'to_transit' }"
+          class="tab"
+          @click="tabSwitch('to_transit')"
+        >
+          发往中转点{{ statusNum.to_transit }}
+        </view>
+        <view
+          :class="{ commodity: follow == 'transit_receipt' }"
+          class="tab"
+          @click="tabSwitch('transit_receipt')"
+        >
+          中转已签收 {{ statusNum.transit_receipt }}
+        </view>
+        <view
+          :class="{ commodity: follow == 'to_overseas' }"
+          class="tab"
+          @click="tabSwitch('to_overseas')"
+        >
+          正发往海外 {{ statusNum.to_overseas }}
+        </view>
+        <view
+          :class="{ commodity: follow == 'other' }"
+          class="tab"
+          @click="tabSwitch('other')"
+        >
+          其他 {{ statusNum.other }}
+        </view>
+      </view>
+    </view>
 
-		</view>
-
-		<view class="content">
-			<view class="prompt" v-if="weights >=300">
-				<image class="prompt-icon" src="../../static/mine/336.png" mode=""></image>
-				当前页面加载的订单总重量300kg
-			</view>
-			<view v-for="item in orderList" :key="item.orderStatus">
-				<PackageCard :itemInfo="item" @toInformation="toInformation"/>
-			</view>
-		</view>
-	</view>
+    <view class="content">
+      <view class="prompt" v-if="weights >= 300">
+        <image
+          class="prompt-icon"
+          src="../../static/mine/336.png"
+          mode=""
+        ></image>
+        当前页面加载的订单总重量300kg
+      </view>
+      <view v-for="item in orderList" :key="item.orderStatus">
+        <PackageCard :itemInfo="item" @toInformation="toInformation" />
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import PackageCard from './component/packageCard.vue';
-	export default {
-		components:{
-			PackageCard
-		},
-		data() {
-			return {
-				follow: 1,
-				weights: 300,
-				orderList:[
-					{
-						labelStatus:0,
-						orderStatus:0,
-					},
-					{
-						labelStatus:1,
-						orderStatus:1,
-					},
-					{
-						labelStatus:1,
-						orderStatus:2,
-					},
-					{
-						labelStatus:0,
-						orderStatus:3,
-					},
-					{
-						labelStatus:0,
-						orderStatus:4,
-					},
-				]
-			};
-		},
-		computed: {
-			i18n() {
-				return this.$t('index')
-			}
-		},
-		methods: {
-			tabSwitch(num) {
-				this.follow = num
-			},
-			toInformation(id){
-				uni.navigateTo({
-					url:`/pageD/orderInformation/orderInformation?orderStatus=${id}`,
-					
-				})
-			}
-		},
-		created() {
-			uni.setNavigationBarTitle({
-				title: this.i18n.myPackage
-			})
-		},
-	}
+import PackageCard from "./component/packageCard.vue";
+export default {
+  components: {
+    PackageCard,
+  },
+  data() {
+    return {
+      follow: "to_transit",
+      weights: 300,
+      orderId: "",
+      containerId: "",
+      statusNum: {},
+      page: 1,
+      orderList: [],
+    };
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    tabSwitch(num) {
+      this.page = 1;
+      this.follow = num;
+      this.getPackageList(1);
+    },
+    toInformation(value) {
+      uni.navigateTo({
+        url: `/pageD/orderInformation/orderInformation?orderStatus=${value.id}`,
+      });
+    },
+    //获取每个状态数量
+    getNum() {
+      uni.$u.http.get(`/api/express-order/status-count`).then((res) => {
+        this.statusNum = res;
+      });
+    },
+    //获取订单列表,默认获取发往中转点的包裹,
+    getPackageList(value) {
+      uni.$u.http
+        .get(
+          `/api/express-order?container_id=${this.containerId}&status_collection=${this.follow}&order_no=${this.orderId}&page=${this.page}&limit=10`
+        )
+        .then((res) => {
+          if (value == 1) {
+            this.orderList = res.data;
+          } else {
+            this.orderList = this.orderList.concat(res.data);
+          }
+          this.total = res.total;
+        });
+    },
+  },
+
+  onReachBottom() {
+    //商品总数量小于当前获取到的商品数量
+    if (this.total > this.orderList.length) {
+      this.page++;
+      this.getPackageList(0);
+    }
+  },
+  created() {
+    this.getPackageList(1);
+    this.getNum();
+    uni.setNavigationBarTitle({
+      title: this.i18n.myPackage,
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.top-search {
-		background-color: #fff;
-		padding: 20rpx 24rpx;
-	}
+.top-search {
+  background-color: #fff;
+  padding: 20rpx 24rpx;
+}
 
-	/deep/.u-input {
-		background-color: #f4f4f4;
-	}
+/deep/.u-input {
+  background-color: #f4f4f4;
+}
 
-	.top-tab {
-		margin-top: 10rpx;
-		display: flex;
-		justify-content: space-between;
-		overflow-y: auto;
-		// flex-shrink: 1;
-		width: 100vw;
+.top-tab {
+  margin-top: 10rpx;
+  display: flex;
+  justify-content: space-between;
+  overflow-y: auto;
+  // flex-shrink: 1;
+  width: 100vw;
 
-		.tab {
-			margin-right: 40rpx;
-			font-size: 26rpx;
-			color: #555;
-			flex-shrink: 0;
-			height: 44rpx;
-			display: flex;
-			align-items: flex-end;
-			font-size: 32rpx;
-		}
+  .tab {
+    margin-right: 40rpx;
+    font-size: 26rpx;
+    color: #555;
+    flex-shrink: 0;
+    height: 44rpx;
+    display: flex;
+    align-items: flex-end;
+    font-size: 32rpx;
+  }
 
-		.commodity {
-			position: relative;
-			font-weight: 600;
-			color: #222;
-		}
+  .commodity {
+    position: relative;
+    font-weight: 600;
+    color: #222;
+  }
 
-		.commodity::before {
-			content: '';
-			display: block;
-			height: 8rpx;
-			width: 100%;
-			background: linear-gradient(to right, #f83224, #fff);
-			position: absolute;
-			bottom: 5rpx;
-			opacity: 0.8;
-		}
-	}
+  .commodity::before {
+    content: "";
+    display: block;
+    height: 8rpx;
+    width: 100%;
+    background: linear-gradient(to right, #f83224, #fff);
+    position: absolute;
+    bottom: 5rpx;
+    opacity: 0.8;
+  }
+}
 
-	.content {
-		padding: 20rpx 24rpx;
+.content {
+  padding: 20rpx 24rpx;
 
-		.prompt {
-			background-color: #FBE8E6;
-			border-radius: 10rpx;
-			padding: 16rpx 22rpx;
-			font-size: 24rpx;
-			display: flex;
-			align-items: center;
-			color: #f83224;
+  .prompt {
+    background-color: #fbe8e6;
+    border-radius: 10rpx;
+    padding: 16rpx 22rpx;
+    font-size: 24rpx;
+    display: flex;
+    align-items: center;
+    color: #f83224;
 
-			.prompt-icon {
-				width: 36rpx;
-				height: 36rpx;
-				margin-right: 20rpx;
-			}
-		}
-	}
-</style>
+    .prompt-icon {
+      width: 36rpx;
+      height: 36rpx;
+      margin-right: 20rpx;
+    }
+  }
+}
+</style>

+ 250 - 222
pageC/orderForm/component/refundCard.vue

@@ -1,229 +1,257 @@
 <template>
-	<view class="detail" @click="$emit('toDetail')">
-		<view class="title">
-			<view class="title-left">
-				<image class="header-img"
-					src="https://tse4-mm.cn.bing.net/th/id/OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA?rs=1&pid=ImgDetMain"
-					mode=""></image>
-				<text>张三</text>
-				<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
-			</view>
-			<text class="order-status" v-if="refundDetail.status == 1">退款中</text>
-			<text class="order-status" v-if="refundDetail.status == 2">退款成功</text>
-			<text class="order-status" v-if="refundDetail.status == 3">拒绝退款</text>
-		</view>
-		<view class="commodity-information">
-			<view class="commodity-1">
-				<image class="commodity-img"
-					src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
-					mode=""></image>
-				<view class="information-right">
-					<view class="commodity-2">
-						<view class="commodity-title">
-							OATLY 噢麦力 醇香燕麦奶植物蛋白
-						</view>
-					</view>
-
-					<view class="commodity-3">
-						<view class="specifications">
-							【醇香】250ml*3
-						</view>
-					</view>
-					<view class="commodity-price">
-						<text style="color: #222;font-size: 26rpx;">退款</text>
-						<text style="font-size: 20rpx;">¥</text>
-						<text>133</text>.
-						<text style="font-size: 20rpx;">22</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="result" v-if="refundDetail.status == 1">
-			<view class="result-left">
-				申请中
-			</view>
-			<view class="result-right">
-				等待卖家同意退款
-			</view>
-		</view>
-		<view class="result" v-if="refundDetail.status == 2">
-			<view class="result-left">
-				退款成功
-			</view>
-			<view class="result-right">
-				退款成功¥29.90
-			</view>
-		</view>
-		<view class="result" v-if="refundDetail.status == 3">
-			<view class="result-left">
-				退款失败
-			</view>
-			<view class="result-right">
-				卖家拒绝退款
-			</view>
-		</view>
-		<view class="btn-list">
-			<button class="status-1">删除记录</button><button class="status-2" @click="$emit('toRefundDetail')">售后详情</button>
-		</view>
-	</view>
+  <view class="detail" @click="$emit('toDetail', itemInfo)">
+    <view class="title">
+      <view class="title-left">
+        <image class="header-img" :src="itemInfo.image" mode=""></image>
+        <text>{{ itemInfo.merchant_name }}</text>
+        <image
+          class="right-325"
+          src="../../../static/mine/325.png"
+          mode=""
+        ></image>
+      </view>
+      <text
+        class="order-status"
+        v-if="itemInfo.order_goods[0].refund.status == 0"
+        >退款中</text
+      >
+      <text
+        class="order-status"
+        v-if="itemInfo.order_goods[0].refund.status == 1"
+        >退款成功</text
+      >
+      <text
+        class="order-status"
+        v-if="itemInfo.order_goods[0].refund.status == 2"
+        >拒绝退款</text
+      >
+    </view>
+    <view class="commodity-information" v-for="item in itemInfo.order_goods">
+      <view class="commodity-1">
+        <image class="commodity-img" :src="item.goods_image" mode=""></image>
+        <view class="information-right">
+          <view class="commodity-2">
+            <view class="commodity-title">
+              {{ item.goods_name }}
+            </view>
+          </view>
+
+          <view class="commodity-3">
+            <view class="specifications"> {{ item.sku_item.item }} </view>
+          </view>
+          <view
+            style="
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+            "
+          >
+            <view class="commodity-price">
+              <text style="color: #222; font-size: 26rpx">退款</text>
+              <text style="font-size: 20rpx">¥</text>
+              <text>{{ item.amount.split(".")[0] }}</text
+              >.
+              <text style="font-size: 20rpx">{{
+                item.amount.split(".")[1]
+              }}</text>
+            </view>
+            <view class="btn-list">
+              <button class="status-1" v-if="item.refund.status == 1">
+                删除记录</button
+              ><button
+                class="status-2"
+                v-if="item.refund.status == 1 || item.refund.status == 0"
+                @click="$emit('toRefundDetail', item)"
+              >
+                售后详情
+              </button>
+              <button class="status-2" v-if="item.refund.status == 2">
+                继续申请
+              </button>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="result" v-if="itemInfo.order_goods[0].refund.status == 0">
+      <view class="result-left"> 申请中 </view>
+      <view class="result-right"> 等待卖家同意退款 </view>
+    </view>
+    <view class="result" v-if="itemInfo.order_goods[0].refund.status == 1">
+      <view class="result-left"> 退款成功 </view>
+      <view class="result-right">
+        退款成功¥{{ itemInfo.order_goods[0].amount }}
+      </view>
+    </view>
+    <view class="result" v-if="itemInfo.order_goods[0].refund.status == 2">
+      <view class="result-left"> 退款失败 </view>
+      <view class="result-right"> 卖家拒绝退款 </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		props:{
-			refundDetail:{
-				typeof:Object,
-				default:{}
-			}
-		},
-		data() {
-			return {
-
-			}
-		},
-	}
+export default {
+  props: {
+    refundDetail: {
+      typeof: Object,
+      default: {},
+    },
+    itemInfo: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {};
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.detail {
-		padding: 28rpx 20rpx;
-		background-color: #fff;
-		border-radius: 16rpx;
-		margin-top: 28rpx;
-
-		.title {
-			display: flex;
-			justify-content: space-between;
-
-			.title-left {
-				display: flex;
-				font-size: 32rpx;
-				align-items: center;
-
-				.header-img {
-					width: 36rpx;
-					height: 36rpx;
-					border-radius: 50%;
-					margin-right: 20rpx;
-				}
-
-				.right-325 {
-					width: 32rpx;
-					height: 32rpx;
-				}
-			}
-
-			.order-status {
-				color: #f83224;
-				font-size: 26rpx;
-			}
-		}
-
-		.commodity-information {
-			margin-top: 28rpx;
-
-			.information-right {
-				width: 70%;
-			}
-
-			.commodity-1 {
-				display: flex;
-
-				.commodity-img {
-					width: 180rpx;
-					height: 180rpx;
-					margin-right: 20rpx;
-					border-radius: 10rpx;
-				}
-
-				.commodity-2 {
-					display: flex;
-					justify-content: space-between;
-
-					.commodity-title {
-						width: 100%;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						margin-right: 38rpx;
-					}
-				}
-
-				.commodity-3 {
-					display: flex;
-					justify-content: space-between;
-					margin-top: 20rpx;
-					color: #777;
-
-					.specifications {
-						font-size: 28rpx;
-						color: #777;
-					}
-				}
-
-				.commodity-price {
-					margin-top: 40rpx;
-				}
-			}
-		}
-
-		.price {
-			display: flex;
-			justify-content: flex-end;
-			font-size: 28rpx;
-			align-items: flex-end;
-		}
-
-		.result {
-			background-color: #f4f4f4;
-			border-radius: 16rpx;
-			height: 76rpx;
-			display: flex;
-			align-items: center;
-			margin-top: 20rpx;
-			padding-left: 24rpx;
-
-			.result-left {
-				margin-right: 32rpx;
-				color: #222;
-				font-size: 28rpx;
-			}
-
-			.result-right {
-				color: #333;
-				font-size: 28rpx;
-			}
-		}
-
-		.btn-list {
-			display: flex;
-			justify-content: flex-end;
-			margin-top: 34rpx;
-
-			.status-1 {
-				background-color: #fff;
-				border-radius: 34rpx;
-				margin: 0;
-				padding: 0;
-				font-size: 28rpx;
-				color: #222;
-				width: 168rpx;
-				height: 68rpx;
-				margin-right: 20rpx;
-				border: 2rpx solid #979797;
-			}
-
-			.status-2 {
-				background-color: #ffffff;
-				border-radius: 34rpx;
-				margin: 0;
-				padding: 0;
-				font-size: 28rpx;
-				color: #f83224;
-				width: 168rpx;
-				height: 68rpx;
-				border: 2rpx solid #f83224;
-			}
-		}
-	}
-</style>
+.detail {
+  padding: 28rpx 20rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin-top: 28rpx;
+
+  .title {
+    display: flex;
+    justify-content: space-between;
+
+    .title-left {
+      display: flex;
+      font-size: 32rpx;
+      align-items: center;
+
+      .header-img {
+        width: 36rpx;
+        height: 36rpx;
+        border-radius: 50%;
+        margin-right: 20rpx;
+      }
+
+      .right-325 {
+        width: 32rpx;
+        height: 32rpx;
+      }
+    }
+
+    .order-status {
+      color: #f83224;
+      font-size: 26rpx;
+    }
+  }
+
+  .commodity-information {
+    margin-top: 28rpx;
+
+    .information-right {
+      width: 70%;
+    }
+
+    .commodity-1 {
+      display: flex;
+
+      .commodity-img {
+        width: 180rpx;
+        height: 180rpx;
+        margin-right: 20rpx;
+        border-radius: 10rpx;
+      }
+
+      .commodity-2 {
+        display: flex;
+        justify-content: space-between;
+
+        .commodity-title {
+          width: 100%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          margin-right: 38rpx;
+        }
+      }
+
+      .commodity-3 {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 20rpx;
+        color: #777;
+
+        .specifications {
+          font-size: 28rpx;
+          color: #777;
+        }
+      }
+
+      .commodity-price {
+        margin-top: 40rpx;
+      }
+    }
+  }
+
+  .price {
+    display: flex;
+    justify-content: flex-end;
+    font-size: 28rpx;
+    align-items: flex-end;
+  }
+
+  .result {
+    background-color: #f4f4f4;
+    border-radius: 16rpx;
+    height: 76rpx;
+    display: flex;
+    align-items: center;
+    margin-top: 20rpx;
+    padding-left: 24rpx;
+
+    .result-left {
+      margin-right: 32rpx;
+      color: #222;
+      font-size: 28rpx;
+    }
+
+    .result-right {
+      color: #333;
+      font-size: 28rpx;
+    }
+  }
+
+  .btn-list {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 34rpx;
+
+    .status-1 {
+      background-color: #fff;
+      border-radius: 34rpx;
+      margin: 0;
+      padding: 0;
+      font-size: 20rpx;
+      color: #222;
+      width: 128rpx;
+      height: 58rpx;
+      line-height: 58rpx;
+      margin-right: 20rpx;
+      border: 2rpx solid #979797;
+    }
+
+    .status-2 {
+      background-color: #ffffff;
+      border-radius: 34rpx;
+      margin: 0;
+      padding: 0;
+      font-size: 20rpx;
+      color: #f83224;
+      width: 128rpx;
+      height: 58rpx;
+      line-height: 58rpx;
+      border: 2rpx solid #f83224;
+    }
+  }
+}
+</style>

+ 64 - 29
pageC/orderForm/orderForm.vue

@@ -10,57 +10,57 @@
     <view class="content">
       <view class="top-tab">
         <view
-          :class="{ commodity: follow == 1 }"
+          :class="{ commodity: follow == '' }"
           class="tab"
-          @click="tabSwitch(1)"
+          @click="tabSwitch('')"
         >
           全部
         </view>
         <view
-          :class="{ commodity: follow == 2 }"
+          :class="{ commodity: follow == 'unpaid' }"
           class="tab"
-          @click="tabSwitch(2)"
+          @click="tabSwitch('unpaid')"
         >
           待付款
         </view>
         <view
-          :class="{ commodity: follow == 3 }"
+          :class="{ commodity: follow == 'unreview' }"
           class="tab"
-          @click="tabSwitch(3)"
+          @click="tabSwitch('unreview')"
         >
           拼团中
         </view>
         <view
-          :class="{ commodity: follow == 4 }"
+          :class="{ commodity: follow == 'undelivered' }"
           class="tab"
-          @click="tabSwitch(4)"
+          @click="tabSwitch('undelivered')"
         >
           待发货
         </view>
         <view
-          :class="{ commodity: follow == 5 }"
+          :class="{ commodity: follow == 'delivered' }"
           class="tab"
-          @click="tabSwitch(5)"
+          @click="tabSwitch('delivered')"
         >
           待收货
         </view>
         <view
-          :class="{ commodity: follow == 6 }"
+          :class="{ commodity: follow == 'finished' }"
           class="tab"
-          @click="tabSwitch(6)"
+          @click="tabSwitch('finished')"
         >
           已完成
         </view>
         <view
-          :class="{ commodity: follow == 7 }"
+          :class="{ commodity: follow == 'refund' }"
           class="tab"
-          @click="tabSwitch(7)"
+          @click="tabSwitch('refund')"
         >
           退款/售后
         </view>
       </view>
-      <view v-for="item in orderList">
-        <view v-if="follow != 7">
+      <view v-for="(item, index) in orderList" :key="index">
+        <view v-if="follow != 'refund'">
           <OrderInofrmation
             :itemInfo="item"
             @toDetail="toDetail"
@@ -76,26 +76,33 @@
         </view>
       </view>
     </view>
+    <AgreePopup :agreeShow="agreeShow" @close="close" :title="title" />
   </view>
 </template>
 
 <script>
 import OrderInofrmation from "./component/orderInofrmation.vue";
 import RefundCard from "./component/refundCard.vue";
+import AgreePopup from "../mineComponent/agreePopup.vue";
 export default {
   components: {
     OrderInofrmation,
     RefundCard,
+    AgreePopup,
   },
   data() {
     return {
       orderList: [],
-      follow: 1,
+      follow: "",
       refundDetail: {
         status: 1,
       },
       page: 1,
       total: 0,
+      status: "",
+      agreeShow: false,
+      title: "",
+      cancellation: {},
     };
   },
   computed: {
@@ -113,34 +120,62 @@ export default {
     //切换搜索订单状态
     tabSwitch(num) {
       this.follow = num;
+      this.getOrderList(1);
     },
     //跳转订单详情
     toDetail(value) {
       uni.navigateTo({
-        url: `/pageC/orderFormDetail/orderFormDetail?orderId=${value.status}`,
+        url: `/pageC/orderFormDetail/orderFormDetail?orderId=${value.order.id}`,
       });
     },
+
+    close(value) {
+      this.agreeShow = false;
+      if (value) {
+        uni.$u.http
+          .post(`/api/order/cancel/${this.cancellation.order.id}`)
+          .then((res) => {
+            uni.showToast({
+              title: "订单已取消",
+              icon: "none",
+            });
+            this.getOrderList(1);
+          });
+      }
+    },
+
     //取消订单
     cancellationOrder(item) {
-      uni.$u.http.post(`/api/order/cancel/${item.order.id}`).then((res) => {
-        console.log(res);
-      });
+      this.agreeShow = true;
+      this.cancellation = item;
+      this.title = "是否确认取消订单";
+      // uni.$u.http.post(`/api/order/cancel/${item.order.id}`).then((res) => {
+      //   console.log(res);
+      // });
     },
 
     //售后订单详情
-    toRefundDetail() {
+    toRefundDetail(value) {
       uni.navigateTo({
-        url: "/pageC/refundDetail/refundDetail",
+        url: `/pageC/refundDetail/refundDetail?orderId=${value.refund.id}`,
       });
     },
-    getOrderList() {
+
+    getOrderList(value) {
       uni.$u.http
-        .get(`/api/order/order_list?status=&page=${this.page}&limit=10`)
+        .get(
+          `/api/order/order_list?status=${this.follow}&page=${this.page}&limit=10`
+        )
         .then((res) => {
-          if (this.orderList.length == 0) {
+          //确定是触底还是点击tab栏
+          if (value) {
             this.orderList = res.data;
           } else {
-            this.orderList = this.orderList.concat(res.data);
+            if (this.orderList.length == 0) {
+              this.orderList = res.data;
+            } else {
+              this.orderList = this.orderList.concat(res.data);
+            }
           }
           this.total = res.total;
         });
@@ -150,11 +185,11 @@ export default {
     //商品总数量小于当前获取到的商品数量
     if (this.total > this.orderList.length) {
       this.page++;
-      this.getOrderList();
+      this.getOrderList(0);
     }
   },
   mounted() {
-    this.getOrderList();
+    this.getOrderList(0);
   },
 };
 </script>

+ 247 - 223
pageC/orderFormDetail/component/commodityDetail.vue

@@ -1,230 +1,254 @@
 <template>
-	<view class="detail">
-		<view class="title">
-			<view class="title-left">
-				<image class="header-img"
-					src="https://tse4-mm.cn.bing.net/th/id/OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA?rs=1&pid=ImgDetMain"
-					mode=""></image>
-				<text>张三</text>
-				<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
-			</view>
-		</view>
-		<view class="commodity-information">
-			<view class="commodity-1">
-				<image class="commodity-img"
-					src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
-					mode=""></image>
-				<view class="">
-					<view class="commodity-2">
-						<view class="commodity-title">
-							OATLY 噢麦力 醇香燕麦…
-						</view>
-						<view class="commodity-price">
-							<text style="font-size: 20rpx;">¥</text>
-							<text>133</text>.
-							<text style="font-size: 20rpx;">22</text>
-						</view>
-					</view>
-
-					<view class="commodity-3">
-						<view class="specifications">
-							【醇香】250ml*3
-						</view>
-						<view style="font-size: 24rpx;">
-							x1
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="btn-list">
-			<button v-if="status == 4">平台介入</button>
-			<button v-if="status == 3||status == 4">退款详情</button>
-			<button v-if="status == 6" @click="application">申请退款</button>
-		</view>
-		<view class="information">
-			<text class="_label">商品总价</text>
-			<view style="color: #222;">
-				<text style="font-size: 20rpx;">¥</text>
-				<text>133</text>.
-				<text style="font-size: 20rpx;">22</text>
-			</view>
-		</view>
-		<view class="information">
-			<text class="_label">商品总重量</text>
-			<view class="_title-right">
-				30Kg
-			</view>
-		</view>
-		<view class="information">
-			<text class="_label">跨境物流</text>
-			<view lass="_title-right">
-				海运散货 | 1号海运柜
-			</view>
-		</view>
-		<view class="information last">
-			<text class="_label">运费</text>
-			<view style="color: #222;">
-				<text style="font-size: 20rpx;">¥</text>
-				<text>133</text>.
-				<text style="font-size: 20rpx;">22</text>
-			</view>
-		</view>
-		<view class="_bottom">
-			<text class="_label">应付款 </text>
-			<view style="color: #f83224;margin-left: 10rpx;">
-				<text style="font-size: 20rpx;">¥</text>
-				<text>133</text>.
-				<text style="font-size: 20rpx;">22</text>
-			</view>
-		</view>
-	</view>
+  <view class="detail">
+    <view class="title">
+      <view class="title-left">
+        <image
+          class="header-img"
+          :src="orderDetail.member.avatar"
+          mode=""
+        ></image>
+        <text>{{ orderDetail.member.nickname }}</text>
+        <image
+          class="right-325"
+          src="../../../static/mine/325.png"
+          mode=""
+        ></image>
+      </view>
+    </view>
+    <view
+      class="commodity-information"
+      v-for="item in orderDetail.goods"
+      :key="item.id"
+    >
+      <view class="commodity-1">
+        <image class="commodity-img" :src="item.merchant.image" mode=""></image>
+        <view class="">
+          <view class="commodity-2">
+            <view class="commodity-title">{{ item.goods_name }} </view>
+            <view class="commodity-price">
+              <text style="font-size: 20rpx">¥</text>
+              <text>{{ item.price.split(".")[0] }}</text
+              >.
+              <text style="font-size: 20rpx">{{
+                item.price.split(".")[1]
+              }}</text>
+            </view>
+          </view>
+
+          <view class="commodity-3">
+            <view class="specifications"> {{ item.sku_item.item }} </view>
+            <view style="font-size: 24rpx"> x{{ item.goods_num }} </view>
+          </view>
+        </view>
+      </view>
+
+      <view class="btn-list">
+        <button v-if="status == 4">平台介入</button>
+        <button v-if="status == 3 || status == 4">退款详情</button>
+        <button
+          v-if="
+            orderDetail.status == 'paid' || orderDetail.status == 'merdelivered'
+          "
+          @click="application(item)"
+        >
+          申请退款
+        </button>
+      </view>
+    </view>
+    <view class="information">
+      <text class="_label">商品总价</text>
+      <view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
+        <text style="font-size: 20rpx">¥</text>
+        <text>{{ orderDetail.goods_amount.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          orderDetail.goods_amount.split(".")[1]
+        }}</text>
+      </view>
+    </view>
+    <view class="information">
+      <text class="_label">商品总重量</text>
+      <view class="_title-right"> {{ orderDetail.weight_total || 0 }}Kg </view>
+    </view>
+    <view class="information">
+      <text class="_label">跨境物流</text>
+      <view lass="_title-right"> 海运散货 | 1号海运柜 </view>
+    </view>
+    <view class="information last">
+      <text class="_label">运费</text>
+      <view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
+        <text style="font-size: 20rpx">¥</text>
+        <text>{{ orderDetail.freight.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          orderDetail.freight.split(".")[1]
+        }}</text>
+      </view>
+    </view>
+    <view class="_bottom">
+      <text class="_label">应付款 </text>
+      <view
+        style="color: #f83224; margin-left: 10rpx; font-weight: 600"
+        v-if="orderDetail.amount"
+      >
+        <text style="font-size: 20rpx">¥</text>
+        <text>{{ orderDetail.amount.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          orderDetail.amount.split(".")[1]
+        }}</text>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import textRight from '../../accountSecurity/component/textRight.vue'
-	export default {
-		components: {
-			textRight
-		},
-		props:{
-			status:{
-				typeof:Number,
-				default:0
-			}
-		},
-		data() {
-			return {
-
-			}
-		},
-		methods:{
-			application(){
-				uni.navigateTo({
-					url:"/pageC/applicationRefund/applicationRefund"
-				})
-			}
-		}
-	}
+import textRight from "../../accountSecurity/component/textRight.vue";
+export default {
+  components: {
+    textRight,
+  },
+  props: {
+    status: {
+      typeof: Number,
+      default: 0,
+    },
+    orderDetail: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    application(value) {
+      uni.navigateTo({
+        url: `/pageC/applicationRefund/applicationRefund?orderId=${value.goods_id}`,
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.detail {
-		padding: 28rpx 20rpx;
-		background-color: #fff;
-		border-radius: 16rpx;
-		margin-top: 28rpx;
-
-		.title {
-			display: flex;
-			justify-content: space-between;
-
-			.title-left {
-				display: flex;
-				font-size: 32rpx;
-				align-items: center;
-
-				.header-img {
-					width: 36rpx;
-					height: 36rpx;
-					border-radius: 50%;
-					margin-right: 20rpx;
-				}
-
-				.right-325 {
-					width: 32rpx;
-					height: 32rpx;
-				}
-			}
-
-			.order-status {
-				color: #f83224;
-				font-size: 26rpx;
-			}
-		}
-
-		.commodity-information {
-			margin-top: 28rpx;
-
-			.commodity-1 {
-				display: flex;
-
-				.commodity-img {
-					width: 180rpx;
-					height: 180rpx;
-					margin-right: 20rpx;
-					border-radius: 10rpx;
-				}
-
-				.commodity-2 {
-					display: flex;
-					justify-content: space-between;
-
-					.commodity-title {
-						width: 328rpx;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						margin-right: 38rpx;
-					}
-				}
-
-				.commodity-3 {
-					display: flex;
-					justify-content: space-between;
-					margin-top: 20rpx;
-					color: #777;
-
-					.specifications {
-						font-size: 28rpx;
-						color: #777;
-					}
-				}
-			}
-		}
-		.last{
-			border-bottom: 2rpx solid rgba(151, 151, 151, .1);
-			padding-bottom: 20rpx;
-		}
-		.btn-list{
-			display: flex;
-			justify-content: flex-end;
-			button{
-				width: 152rpx;
-				height: 58rpx;
-				border: 2rpx solid #979797;
-				color: #444;
-				margin: 0;
-				padding: 0;
-				font-size: 24rpx;
-				background-color: #fff;
-				border-radius: 34rpx;
-				margin-top: 20rpx;
-				margin-left: 20rpx;
-			}
-		}
-		.information {
-			display: flex;
-			justify-content: space-between;
-			font-size: 28rpx;
-			align-items: flex-end;
-			margin: 34rpx 0;
-			._label{
-				font-size: 28rpx;
-				color: #333;
-			}
-			._title-right{
-				font-size: 28rpx;
-				color: #333;
-			}
-		}
-		._bottom{
-				display: flex;
-				justify-content: flex-end;
-				font-size: 28rpx;
-				align-items: flex-end;
-				margin-top: 34rpx;
-		}
-
-	}
-</style>
+.detail {
+  padding: 28rpx 20rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin-top: 28rpx;
+
+  .title {
+    display: flex;
+    justify-content: space-between;
+
+    .title-left {
+      display: flex;
+      font-size: 32rpx;
+      align-items: center;
+
+      .header-img {
+        width: 36rpx;
+        height: 36rpx;
+        border-radius: 50%;
+        margin-right: 20rpx;
+      }
+
+      .right-325 {
+        width: 32rpx;
+        height: 32rpx;
+      }
+    }
+
+    .order-status {
+      color: #f83224;
+      font-size: 26rpx;
+    }
+  }
+
+  .commodity-information {
+    margin-top: 28rpx;
+
+    .commodity-1 {
+      display: flex;
+
+      .commodity-img {
+        width: 180rpx;
+        height: 180rpx;
+        margin-right: 20rpx;
+        border-radius: 10rpx;
+      }
+
+      .commodity-2 {
+        display: flex;
+        justify-content: space-between;
+
+        .commodity-title {
+          width: 328rpx;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          margin-right: 38rpx;
+        }
+      }
+
+      .commodity-3 {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 20rpx;
+        color: #777;
+
+        .specifications {
+          font-size: 28rpx;
+          color: #777;
+        }
+      }
+    }
+  }
+  .last {
+    border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+    padding-bottom: 20rpx;
+  }
+  .btn-list {
+    display: flex;
+    justify-content: flex-end;
+    button {
+      width: 152rpx;
+      height: 58rpx;
+      border: 2rpx solid #979797;
+      color: #444;
+      margin: 0;
+      padding: 0;
+      font-size: 24rpx;
+      background-color: #fff;
+      border-radius: 34rpx;
+      margin-top: 20rpx;
+      margin-left: 20rpx;
+    }
+  }
+  .information {
+    display: flex;
+    justify-content: space-between;
+    font-size: 28rpx;
+    align-items: flex-end;
+    margin: 34rpx 0;
+    ._label {
+      font-size: 28rpx;
+      color: #333;
+    }
+    ._title-right {
+      font-size: 28rpx;
+      color: #333;
+    }
+  }
+  ._bottom {
+    display: flex;
+    justify-content: flex-end;
+    font-size: 28rpx;
+    align-items: flex-end;
+    margin-top: 34rpx;
+  }
+}
+</style>

+ 378 - 252
pageC/orderFormDetail/orderFormDetail.vue

@@ -1,276 +1,402 @@
 <template>
-	<view class="page" @click="closeShow">
-		<!-- 订单状态 -->
-		<view class="title">
-			<view v-if="status == 1">
-				<view class="payment">
-					等待付款
-				</view>
-				<text class="timer">剩22小时52分自动关闭</text>
-			</view>
-			<view class="payment" v-else-if="status == 2">
-				超时未付款,订单已取消
-			</view>
-			<view class="payment" v-else-if="status == 3">
-				未发货,退款成功
-			</view>
-			<view class="payment" v-else-if="status == 4">
-				未发货,退款中
-			</view>
-			<view class="payment" v-else-if="status == 5">
-				拼团中
-			</view>
-			<view class="payment" v-else-if="status == 6">
-				已付款,等待发货
-			</view>
-			<view class="payment" v-else-if="status == 7">
-				已发货,等待收货
-			</view>
-			<view class="payment" v-else-if="status == 8">
-				订单已完成,交易成功
-			</view>
-		</view>
-		<!-- 订单状态 -->
+  <view class="page" @click="closeShow">
+    <!-- 订单状态 -->
+    <view class="title">
+      <view v-if="orderDetail.simplify_status == 'unpaid'">
+        <view class="payment"> 等待付款 </view>
+        <text class="timer">剩22小时52分自动关闭</text>
+      </view>
+      <view class="payment" v-else-if="orderDetail.status == 'closed'">
+        超时未付款,订单已取消
+      </view>
+      <view class="payment" v-else-if="status == 3"> 未发货,退款成功 </view>
+      <view class="payment" v-else-if="status == 4"> 未发货,退款中 </view>
+      <view
+        class="payment"
+        v-else-if="orderDetail.simplify_status == 'unreview'"
+      >
+        拼团中
+      </view>
+      <view
+        class="payment"
+        v-else-if="
+          orderDetail.status == 'paid' || orderDetail.status == 'merdelivered'
+        "
+      >
+        已付款,等待发货
+      </view>
+      <view
+        class="payment"
+        v-else-if="orderDetail.simplify_status == 'delivered'"
+      >
+        已发货,等待收货
+      </view>
+      <view
+        class="payment"
+        v-else-if="orderDetail.simplify_status == 'finished'"
+      >
+        订单已完成,交易成功
+      </view>
+    </view>
+    <!-- 订单状态 -->
 
-		<!-- 地址信息 -->
-		<view class="address">
-			<view class="name-phone">
-				<u-icon name="map" size="22"></u-icon>
-				<view style="margin: 0 20rpx;font-size: 32rpx;">陈曦</view>
-				<text class="phone">17800000000</text>
-			</view>
-			<view class="address-detail">
-				江苏省淮安市清江浦区北京南路99号(青浦大桥南侧200
-				米)淮安恒大名都3号楼一单元1602
-			</view>
-		</view>
+    <!-- 地址信息 -->
+    <view class="address">
+      <view class="name-phone">
+        <u-icon name="map" size="22"></u-icon>
+        <view style="margin: 0 20rpx; font-size: 32rpx">{{
+          orderDetail.address_name
+        }}</view>
+        <text class="phone">{{ orderDetail.address_mobile }}</text>
+      </view>
+      <view class="address-detail">
+        {{ orderDetail.full_address }}
+      </view>
+    </view>
 
-		<commodityDetailVue :status="status" />
+    <commodityDetailVue :status="status" :orderDetail="orderDetail" />
 
-		<view class="order">
-			<view class="order-number">
-				<text>
-					订单编号
-				</text>
-				<view>
-					8998391920137645 | <text decode @click="cope('111')">{{"&nbsp;"+"复制"}}</text>
-				</view>
-			</view>
-			<view class="order-number"
-				v-if="status == 3||status == 4||status == 5||status == 6||status == 7||status == 8">
-				<text>
-					支付方式
-				</text>
-				<view>
-					微信支付
-				</view>
-			</view>
-			<view class="order-number"
-				v-if="status == 3||status == 4||status == 5||status == 6||status == 7||status == 8">
-				<text>
-					支付时间
-				</text>
-				<view>
-					2023-12-08 22:40:03
-				</view>
-			</view>
-			<view class="order-number">
-				<text>
-					下单时间
-				</text>
-				<view>
-					2023-12-08 22:40:03
-				</view>
-			</view>
-		</view>
-		<view class="contact" v-if="status == 1||status == 6">
-			联系团长
-		</view>
-		<view class="footer" v-if="status != 6">
-			<button class="status-1" v-if="status == 1||status == 5">取消订单</button>
-			<button class="status-2" v-if="status == 1">继续付款</button>
-			<button class="status-1" v-if="status == 2||status == 3||status == 4">删除订单</button>
-			<button class="status-2" v-if="status == 2||status == 3||status == 4">再次购买</button>
-			<button class="status-1" v-if="status == 7">查看物流</button>
-			<button class="status-2" v-if="status == 7">确认收货</button>
-			<view style="margin-right: 40rpx; color: #777;font-size: 28rpx;" v-if="status == 8" @click="more">更多</view>
-			<button class="status-1" v-if="status == 8">查看物流</button>
-			<button class="status-1" v-if="status == 8">再来一单</button>
-			<button class="status-2" v-if="status == 8" @click.stop="toEvaluate">评价</button>
-		</view>
+    <view class="order">
+      <view class="order-number">
+        <text> 订单编号 </text>
+        <view>
+          {{ orderDetail.order_no }} |
+          <text decode @click="cope(orderDetail.order_no)">{{
+            "&nbsp;" + "复制"
+          }}</text>
+        </view>
+      </view>
+      <view
+        class="order-number"
+        v-if="
+          orderDetail.simplify_status == 'unreview' ||
+          orderDetail.status == 'paid' ||
+          orderDetail.status == 'merdelivered' ||
+          orderDetail.simplify_status == 'finished' ||
+          orderDetail.simplify_status == 'delivered'
+        "
+      >
+        <text> 支付方式 </text>
+        <view> {{ orderDetail.pay_type_name }} </view>
+      </view>
+      <view
+        class="order-number"
+        v-if="
+          orderDetail.simplify_status == 'unreview' ||
+          orderDetail.status == 'paid' ||
+          orderDetail.simplify_status == 'finished' ||
+          orderDetail.simplify_status == 'undelivered' ||
+          orderDetail.simplify_status == 'delivered'
+        "
+      >
+        <text> 支付时间 </text>
+        <view> {{ orderDetail.paid_at }} </view>
+      </view>
+      <view class="order-number">
+        <text> 下单时间 </text>
+        <view>{{ orderDetail.created_at }} </view>
+      </view>
+    </view>
+    <view
+      class="contact"
+      v-if="
+        orderDetail.status == 'unpaid' ||
+        orderDetail.status == 'paid' ||
+        orderDetail.status != 'merdelivered' ||
+        orderDetail.simplify_status == 'undelivered'
+      "
+    >
+      联系团长
+    </view>
+    <view
+      class="footer"
+      v-if="
+        orderDetail.status != 'paid' && orderDetail.status != 'merdelivered'
+      "
+    >
+      <button
+        class="status-1"
+        v-if="
+          orderDetail.status == 'unpaid' ||
+          orderDetail.simplify_status == 'unreview'
+        "
+        @click="cancelOrder"
+      >
+        取消订单
+      </button>
+      <button class="status-2" v-if="orderDetail.status == 'unpaid'">
+        继续付款
+      </button>
+      <button
+        class="status-1"
+        v-if="orderDetail.status == 'closed' || status == 3 || status == 4"
+      >
+        删除订单
+      </button>
+      <button
+        class="status-2"
+        v-if="orderDetail.status == 'closed' || status == 3 || status == 4"
+      >
+        再次购买
+      </button>
+      <button
+        class="status-1"
+        v-if="orderDetail.simplify_status == 'delivered'"
+      >
+        查看物流
+      </button>
+      <button
+        class="status-2"
+        v-if="orderDetail.simplify_status == 'delivered'"
+        @click="confirmReceipt"
+      >
+        确认收货
+      </button>
+      <view
+        style="margin-right: 40rpx; color: #777; font-size: 28rpx"
+        v-if="orderDetail.simplify_status == 'finished'"
+        @click="more"
+        >更多</view
+      >
+      <button class="status-1" v-if="orderDetail.simplify_status == 'finished'">
+        查看物流
+      </button>
+      <button class="status-1" v-if="orderDetail.simplify_status == 'finished'">
+        再来一单
+      </button>
+      <button
+        class="status-2"
+        v-if="orderDetail.simplify_status == 'finished'"
+        @click.stop="toEvaluate"
+      >
+        评价
+      </button>
+    </view>
 
-		<u-transition :show="show">
-			<view class="transition">删除订单</view>
-		</u-transition>
-	</view>
+    <u-transition :show="show">
+      <view class="transition">删除订单</view>
+    </u-transition>
+    <agreePopup title="是否确认收货" :agreeShow="agreeShow" @close="close" />
+  </view>
 </template>
 
 <script>
-	import commodityDetailVue from './component/commodityDetail.vue'
-	export default {
-		components: {
-			commodityDetailVue
-		},
-		data() {
-			return {
-				status: 6,
-				show: false
-			}
-		},
-		methods: {
-			//复制
-			cope(e) {
-				uni.setClipboardData({
-					data: e,
-					success() {
-						uni.showToast({
-							title: "复制成功",
-							icon: "none"
-						})
-					}
-				})
-			},
-			//跳转评论
-			toEvaluate() {
-				uni.navigateTo({
-					url: "/pageD/evaluate/evaluate"
-				})
-			},
-			more() {
-				this.show = true
-			},
-			closeShow(e) {
-				if (e._relatedInfo.anchorTargetText != "更多" && e._relatedInfo.anchorTargetText != "删除订单") {
-					this.show = false
-				}
-			}
-		},
-		created() {},
-		onLoad(option) {
-			this.status = option.orderId
-		}
-	}
+import commodityDetailVue from "./component/commodityDetail.vue";
+import agreePopup from "../mineComponent/agreePopup.vue";
+export default {
+  components: {
+    commodityDetailVue,
+    agreePopup,
+  },
+  data() {
+    return {
+      status: 6,
+      show: false,
+      orderDetail: {},
+      agreeShow: false,
+    };
+  },
+  methods: {
+    //复制
+    cope(e) {
+      uni.setClipboardData({
+        data: e,
+        success() {
+          uni.showToast({
+            title: "复制成功",
+            icon: "none",
+          });
+        },
+      });
+    },
+    //跳转评论
+    toEvaluate() {
+      uni.navigateTo({
+        url: `/pageD/evaluate/evaluate?orderId=${this.orderDetail.id}`,
+      });
+    },
+    more() {
+      this.show = true;
+    },
+    //确认收货
+    confirmReceipt() {
+      this.agreeShow = true;
+      // uni.$u.http
+      //   .post(`/api/order/receive/${this.orderDetail.id}`)
+      //   .then((res) => {});
+    },
+    //value为true时,确认收货
+    close(value) {
+      if (value) {
+        uni.$u.http
+          .post(`/api/order/receive/${this.orderDetail.id}`)
+          .then((res) => {
+            this.agreeShow = false;
+            this.getDetail();
+            uni.showToast({
+              title: "订单已确认收货",
+              icon: "none",
+            });
+          });
+      } else {
+        this.agreeShow = false;
+      }
+    },
+    closeShow(e) {
+      if (
+        e._relatedInfo.anchorTargetText != "更多" &&
+        e._relatedInfo.anchorTargetText != "删除订单"
+      ) {
+        this.show = false;
+      }
+    },
+    //取消订单
+    cancelOrder() {
+      uni.$u.http
+        .post(`/api/order/cancel/${this.orderDetail.id}`)
+        .then((res) => {
+          this.getDetail();
+          uni.showToast({
+            title: "已取消",
+            icon: "none",
+          });
+        });
+    },
+    getDetail() {
+      uni.$u.http.get(`/api/order/read?id=${this.status}`).then((res) => {
+        this.orderDetail = res;
+      });
+    },
+  },
+  created() {},
+  mounted() {
+    this.getDetail();
+  },
+  onLoad(option) {
+    this.status = option.orderId;
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.page {
-		padding: 20rpx 24rpx 180rpx;
+.page {
+  padding: 20rpx 24rpx 180rpx;
 
-		.title {
-			.payment {
-				font-size: 44rpx;
-				font-weight: 600;
-				margin-bottom: 20rpx;
-			}
+  .title {
+    .payment {
+      font-size: 44rpx;
+      font-weight: 600;
+      margin-bottom: 20rpx;
+    }
 
-			.timer {
-				font-size: 28rpx;
-				color: #666;
-			}
-		}
+    .timer {
+      font-size: 28rpx;
+      color: #666;
+    }
+  }
 
-		.address {
-			background-color: #fff;
-			border-radius: 16rpx;
-			padding: 34rpx 24rpx 28rpx;
-			margin-top: 24rpx;
+  .address {
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 34rpx 24rpx 28rpx;
+    margin-top: 24rpx;
 
-			.name-phone {
-				display: flex;
-				align-items: center;
-				align-items: flex-end;
+    .name-phone {
+      display: flex;
+      align-items: center;
+      align-items: flex-end;
 
-				.phone {
-					font-size: 26rpx;
-					color: #666;
-				}
-			}
+      .phone {
+        font-size: 26rpx;
+        color: #666;
+      }
+    }
 
-			.address-detail {
-				margin-top: 20rpx;
-				font-size: 24rpx;
-				color: #444;
-				margin-left: 60rpx;
-			}
-		}
+    .address-detail {
+      margin-top: 20rpx;
+      font-size: 24rpx;
+      color: #444;
+      margin-left: 60rpx;
+    }
+  }
 
-		.order {
-			background-color: #fff;
-			border-radius: 16rpx;
-			color: rgba(54, 54, 54, .7);
-			font-size: 28rpx;
-			margin-top: 20rpx;
-			padding: 20rpx 20rpx;
+  .order {
+    background-color: #fff;
+    border-radius: 16rpx;
+    color: rgba(54, 54, 54, 0.7);
+    font-size: 28rpx;
+    margin-top: 20rpx;
+    padding: 20rpx 20rpx;
 
-			.order-number {
-				display: flex;
-				justify-content: space-between;
-				margin-bottom: 32rpx;
-			}
-		}
+    .order-number {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 32rpx;
+    }
+  }
 
-		.contact {
-			padding: 20rpx 0;
-			background-color: #fff;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			border-radius: 16rpx;
-			margin-top: 20rpx;
-			margin-bottom: 160rpx;
-		}
+  .contact {
+    padding: 20rpx 0;
+    background-color: #fff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 16rpx;
+    margin-top: 20rpx;
+    margin-bottom: 160rpx;
+  }
 
-		.footer {
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			background-color: #fff;
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
-			padding-top: 20rpx;
-			padding-bottom: 80rpx;
-			height: 66rpx;
-			width: 100%;
+  .footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    background-color: #fff;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    padding-top: 20rpx;
+    padding-bottom: 80rpx;
+    height: 66rpx;
+    width: 100%;
 
-			.status-1 {
-				background-color: #fff;
-				border-radius: 34rpx;
-				margin: 0;
-				padding: 0;
-				font-size: 28rpx;
-				color: #222;
-				width: 168rpx;
-				height: 68rpx;
-				margin-right: 20rpx;
-				border: 2rpx solid #979797;
-			}
+    .status-1 {
+      background-color: #fff;
+      border-radius: 34rpx;
+      margin: 0;
+      padding: 0;
+      font-size: 28rpx;
+      color: #222;
+      width: 168rpx;
+      height: 68rpx;
+      margin-right: 20rpx;
+      border: 2rpx solid #979797;
+    }
 
-			.status-2 {
-				background-color: #ffffff;
-				border-radius: 34rpx;
-				margin: 0;
-				padding: 0;
-				font-size: 28rpx;
-				color: #f83224;
-				width: 168rpx;
-				height: 68rpx;
-				border: 2rpx solid #f83224;
-				margin-right: 24rpx;
-			}
-		}
+    .status-2 {
+      background-color: #ffffff;
+      border-radius: 34rpx;
+      margin: 0;
+      padding: 0;
+      font-size: 28rpx;
+      color: #f83224;
+      width: 168rpx;
+      height: 68rpx;
+      border: 2rpx solid #f83224;
+      margin-right: 24rpx;
+    }
+  }
 
-		.transition {
-			width: 164rpx;
-			height: 88rpx;
-			background: #FFFFFF;
-			box-shadow: 0rpx 0rpx 20rpx -6rpx rgba(0, 0, 0, 0.3);
-			position: fixed;
-			bottom: 160rpx;
-			text-align: center;
-			line-height: 88rpx;
-			font-size: 26rpx;
-			color: #222;
-		}
-	}
-</style>
+  .transition {
+    width: 164rpx;
+    height: 88rpx;
+    background: #ffffff;
+    box-shadow: 0rpx 0rpx 20rpx -6rpx rgba(0, 0, 0, 0.3);
+    position: fixed;
+    bottom: 160rpx;
+    text-align: center;
+    line-height: 88rpx;
+    font-size: 26rpx;
+    color: #222;
+  }
+}
+</style>

+ 66 - 58
pageC/refundDetail/component/refundInProgress.vue

@@ -1,65 +1,73 @@
 <template>
-	<view class="top-direction">
-		<view class="direction-frist">
-			<view class="">
-				退款成功
-			</view>
-			<view class="commodity-price">
-				<text style="font-size: 20rpx;">¥</text>
-				<text>133</text>.
-				<text style="font-size: 20rpx;">22</text>
-			</view>
-		</view>
-		<view class="time">
-			剩余2天12时34分,若超时处理,退款申请将自动通过
-		</view>
-
-	</view>
+  <view class="top-direction">
+    <view class="direction-frist">
+      <view class=""> 退款中 </view>
+      <view class="commodity-price">
+        <text style="font-size: 20rpx">¥</text>
+        <text>{{ refundDetail.amount.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          refundDetail.amount.split(".")[1]
+        }}</text>
+      </view>
+    </view>
+    <view class="time"> 剩余2天12时34分,若超时处理,退款申请将自动通过 </view>
+  </view>
 </template>
 
 <script>
+export default {
+  props: {
+    refundDetail: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.top-direction {
-		padding: 36rpx 24rpx;
-		border-radius: 16rpx;
-		background-color: #fff;
-	
-		.direction-frist {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 36rpx;
-			font-weight: 500;
-			.commodity-price{
-				color: #F83224;
-			}
-		}
-	
-		.time {
-			color: rgba(34, 34, 34, .6);
-			font-size: 24rpx;
-			margin-top: 20rpx;
-		}
-		
-		.direction-last{
-			margin-top: 32rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 28rpx;
-			color: #333;
-		}
-		.check{
-			margin-top: 44rpx;
-			border-radius: 38rpx;
-			background-color: #fff;
-			padding: 0;
-			border: 2rpx solid rgba(151, 151, 151, .2);
-			color: #333;
-			font-size: 28rpx;
-			height: 76rpx;
-		}
-	}
-</style>
+.top-direction {
+  padding: 36rpx 24rpx;
+  border-radius: 16rpx;
+  background-color: #fff;
+
+  .direction-frist {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 36rpx;
+    font-weight: 500;
+    .commodity-price {
+      color: #f83224;
+    }
+  }
+
+  .time {
+    color: rgba(34, 34, 34, 0.6);
+    font-size: 24rpx;
+    margin-top: 20rpx;
+  }
+
+  .direction-last {
+    margin-top: 32rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 28rpx;
+    color: #333;
+  }
+  .check {
+    margin-top: 44rpx;
+    border-radius: 38rpx;
+    background-color: #fff;
+    padding: 0;
+    border: 2rpx solid rgba(151, 151, 151, 0.2);
+    color: #333;
+    font-size: 28rpx;
+    height: 76rpx;
+  }
+}
+</style>

+ 249 - 243
pageC/refundDetail/component/refundInformation.vue

@@ -1,250 +1,256 @@
 <template>
-	<view class="detail">
-		<view class="title">
-			<view class="title-left">
-				<image class="header-img"
-					src="https://tse4-mm.cn.bing.net/th/id/OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA?rs=1&pid=ImgDetMain"
-					mode=""></image>
-				<text>张三</text>
-				<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
-			</view>
-			<view class="title-right">
-				<u-icon name="chat" color="#f83224" size="28"></u-icon>
-				<text>联系团长</text>
-			</view>
-		</view>
-		<view class="commodity-information">
-			<view class="commodity-1">
-				<image class="commodity-img"
-					src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
-					mode=""></image>
-				<view class="">
-					<view class="commodity-2">
-						<view class="commodity-title">
-							OATLY 噢麦力 醇香燕麦…
-						</view>
-					</view>
-
-					<view class="commodity-3">
-						<view class="specifications">
-							【醇香】250ml*3
-						</view>
-						<view style="font-size: 24rpx;">
-							x1
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="information">
-			<text class="_label">订单编号</text>
-			<view style="color: #222;">
-				<text style="color: rgba(34, 34, 34, .6);">29819301003001313456</text>
-				<text @click="cope('111')" style="color: #f83224;">{{'&nbsp;' + "|" + "&nbsp;" + "复制"}}</text>
-
-			</view>
-		</view>
-		<view class="information">
-			<text class="_label">退款原因</text>
-			<view class="_title-right">
-				商品问题
-			</view>
-		</view>
-		<view class="information">
-			<text class="_label">退款金额</text>
-			<view class="_title-right">
-				¥134.80
-			</view>
-		</view>
-		<view class="information">
-			<text class="_label">申请件数</text>
-			<view class="_title-right">1
-			</view>
-		</view>
-		<view class="information">
-			<text class="_label">申请时间</text>
-			<view class="_title-right">2023-12-02 18:37
-			</view>
-		</view>
-
-	</view>
+  <view class="detail">
+    <view class="title">
+      <view class="title-left">
+        <image
+          class="header-img"
+          :src="goodsDetail.merchant.image"
+          mode=""
+        ></image>
+        <text>{{ goodsDetail.merchant.merchant_name }}</text>
+        <image
+          class="right-325"
+          src="../../../static/mine/325.png"
+          mode=""
+        ></image>
+      </view>
+      <view class="title-right">
+        <u-icon name="chat" color="#f83224" size="28"></u-icon>
+        <text>联系团长</text>
+      </view>
+    </view>
+    <view class="commodity-information">
+      <view class="commodity-1">
+        <image
+          class="commodity-img"
+          :src="goodsDetail.goods_image"
+          mode=""
+        ></image>
+        <view class="">
+          <view class="commodity-2">
+            <view class="commodity-title">{{ goodsDetail.goods_name }} </view>
+          </view>
+
+          <view class="commodity-3">
+            <view class="specifications">
+              {{ goodsDetail.sku_item.item }}
+            </view>
+            <view style="font-size: 24rpx"> x{{ goodsDetail.goods_num }} </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="information">
+      <text class="_label">订单编号</text>
+      <view style="color: #222">
+        <text style="color: rgba(34, 34, 34, 0.6)">{{
+          goodsDetail.order_no
+        }}</text>
+        <text @click="cope('111')" style="color: #f83224">{{
+          "&nbsp;" + "|" + "&nbsp;" + "复制"
+        }}</text>
+      </view>
+    </view>
+    <view class="information">
+      <text class="_label">退款原因</text>
+      <view class="_title-right"> {{ goodsDetail.refund.refund_reason }} </view>
+    </view>
+    <view class="information">
+      <text class="_label">退款金额</text>
+      <view class="_title-right"> ¥{{ goodsDetail.amount }} </view>
+    </view>
+    <view class="information">
+      <text class="_label">申请件数</text>
+      <view class="_title-right">1 </view>
+    </view>
+    <view class="information">
+      <text class="_label">申请时间</text>
+      <view class="_title-right">{{ goodsDetail.created_at }}</view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import textRight from '../../accountSecurity/component/textRight.vue'
-	export default {
-		components: {
-			textRight
-		},
-		props: {
-			status: {
-				typeof: Number,
-				default: 0
-			}
-		},
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-			application() {
-				uni.navigateTo({
-					url: "/pageC/applicationRefund/applicationRefund"
-				})
-			},
-			
-			//复制
-			cope(e) {
-				uni.setClipboardData({
-					data: e,
-					success() {
-						uni.showToast({
-							title: "复制成功",
-							icon: "none"
-						})
-					}
-				})
-			},
-		},
-
-	}
+import textRight from "../../accountSecurity/component/textRight.vue";
+export default {
+  components: {
+    textRight,
+  },
+  props: {
+    status: {
+      typeof: Number,
+      default: 0,
+    },
+    goodsDetail: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      packageId: "",
+    };
+  },
+  onLoad(options) {},
+  methods: {
+    application() {
+      uni.navigateTo({
+        url: "/pageC/applicationRefund/applicationRefund",
+      });
+    },
+
+    //复制
+    cope(e) {
+      uni.setClipboardData({
+        data: e,
+        success() {
+          uni.showToast({
+            title: "复制成功",
+            icon: "none",
+          });
+        },
+      });
+    },
+    getDetail() {},
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.detail {
-		padding: 28rpx 20rpx;
-		background-color: #fff;
-		border-radius: 16rpx;
-		margin-top: 28rpx;
-
-		.title {
-			display: flex;
-			justify-content: space-between;
-			border-bottom: 2rpx solid rgba(151, 151, 151, .1);
-			padding-bottom: 20rpx;
-
-			.title-left {
-				display: flex;
-				font-size: 32rpx;
-				align-items: center;
-
-				.header-img {
-					width: 36rpx;
-					height: 36rpx;
-					border-radius: 50%;
-					margin-right: 20rpx;
-				}
-
-				.right-325 {
-					width: 32rpx;
-					height: 32rpx;
-				}
-			}
-
-			.title-right {
-				color: #333;
-				display: flex;
-				align-items: center;
-				font-size: 28rpx;
-			}
-
-			.order-status {
-				color: #f83224;
-				font-size: 26rpx;
-			}
-		}
-
-		.commodity-information {
-			margin-top: 28rpx;
-
-			.commodity-1 {
-				display: flex;
-
-				.commodity-img {
-					width: 180rpx;
-					height: 180rpx;
-					margin-right: 20rpx;
-					border-radius: 10rpx;
-				}
-
-				.commodity-2 {
-					display: flex;
-					justify-content: space-between;
-
-					.commodity-title {
-						width: 472rpx;
-						max-height: 80rpx;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						margin-right: 38rpx;
-					}
-				}
-
-				.commodity-3 {
-					display: flex;
-					justify-content: space-between;
-					margin-top: 20rpx;
-					color: #777;
-
-					.specifications {
-						font-size: 28rpx;
-						color: #777;
-					}
-				}
-			}
-		}
-
-		.last {
-			border-bottom: 2rpx solid rgba(151, 151, 151, .1);
-			padding-bottom: 20rpx;
-		}
-
-		.btn-list {
-			display: flex;
-			justify-content: flex-end;
-
-			button {
-				width: 152rpx;
-				height: 58rpx;
-				border: 2rpx solid #979797;
-				color: #444;
-				margin: 0;
-				padding: 0;
-				font-size: 24rpx;
-				background-color: #fff;
-				border-radius: 34rpx;
-				margin-top: 20rpx;
-				margin-left: 20rpx;
-			}
-		}
-
-		.information {
-			display: flex;
-			justify-content: space-between;
-			font-size: 28rpx;
-			align-items: flex-end;
-			margin: 34rpx 0;
-
-			._label {
-				font-size: 28rpx;
-				color: #333;
-			}
-
-			._title-right {
-				font-size: 28rpx;
-				color: rgba(34, 34, 34, .6);
-			}
-		}
-
-		._bottom {
-			display: flex;
-			justify-content: flex-end;
-			font-size: 28rpx;
-			align-items: flex-end;
-			margin-top: 34rpx;
-		}
-
-	}
-</style>
+.detail {
+  padding: 28rpx 20rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin-top: 28rpx;
+
+  .title {
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+    padding-bottom: 20rpx;
+
+    .title-left {
+      display: flex;
+      font-size: 32rpx;
+      align-items: center;
+
+      .header-img {
+        width: 36rpx;
+        height: 36rpx;
+        border-radius: 50%;
+        margin-right: 20rpx;
+      }
+
+      .right-325 {
+        width: 32rpx;
+        height: 32rpx;
+      }
+    }
+
+    .title-right {
+      color: #333;
+      display: flex;
+      align-items: center;
+      font-size: 28rpx;
+    }
+
+    .order-status {
+      color: #f83224;
+      font-size: 26rpx;
+    }
+  }
+
+  .commodity-information {
+    margin-top: 28rpx;
+
+    .commodity-1 {
+      display: flex;
+
+      .commodity-img {
+        width: 180rpx;
+        height: 180rpx;
+        margin-right: 20rpx;
+        border-radius: 10rpx;
+      }
+
+      .commodity-2 {
+        display: flex;
+        justify-content: space-between;
+
+        .commodity-title {
+          width: 472rpx;
+          max-height: 80rpx;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          margin-right: 38rpx;
+        }
+      }
+
+      .commodity-3 {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 20rpx;
+        color: #777;
+
+        .specifications {
+          font-size: 28rpx;
+          color: #777;
+        }
+      }
+    }
+  }
+
+  .last {
+    border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+    padding-bottom: 20rpx;
+  }
+
+  .btn-list {
+    display: flex;
+    justify-content: flex-end;
+
+    button {
+      width: 152rpx;
+      height: 58rpx;
+      border: 2rpx solid #979797;
+      color: #444;
+      margin: 0;
+      padding: 0;
+      font-size: 24rpx;
+      background-color: #fff;
+      border-radius: 34rpx;
+      margin-top: 20rpx;
+      margin-left: 20rpx;
+    }
+  }
+
+  .information {
+    display: flex;
+    justify-content: space-between;
+    font-size: 28rpx;
+    align-items: flex-end;
+    margin: 34rpx 0;
+
+    ._label {
+      font-size: 28rpx;
+      color: #333;
+    }
+
+    ._title-right {
+      font-size: 28rpx;
+      color: rgba(34, 34, 34, 0.6);
+    }
+  }
+
+  ._bottom {
+    display: flex;
+    justify-content: flex-end;
+    font-size: 28rpx;
+    align-items: flex-end;
+    margin-top: 34rpx;
+  }
+}
+</style>

+ 114 - 49
pageC/refundDetail/refundDetail.vue

@@ -1,56 +1,121 @@
 <template>
-	<view class="page">
-		<RefundSuccessful v-if="status==1" @checkMoney="checkMoney"  />
-		
-		<RefundInProgress v-if="status == 2" />
-		
-		<RefusalToRefund v-if="status == 3" />
-		
-		<RefundInformation />
-		<MoneyDestination :show="show" @close="close" />
-	</view>
+  <view class="page">
+    <RefundSuccessful
+      v-if="refundDetail.goods[0].refund.status == 1"
+      @checkMoney="checkMoney"
+    />
+
+    <RefundInProgress
+      v-if="refundDetail.goods[0].refund.status == 0"
+      :refundDetail="refundDetail"
+    />
+
+    <RefusalToRefund v-if="refundDetail.goods[0].refund.status == 3" />
+
+    <RefundInformation :goodsDetail="refundDetail.goods[0]" />
+    <MoneyDestination :show="show" @close="close" />
+    <view class="footer">
+      <button class="btn" @click="platformIntervene">平台介入</button>
+    </view>
+  </view>
 </template>
 
 <script>
-	import RefundSuccessful from './component/refundSuccessful.vue';
-	import RefundInProgress from './component/refundInProgress.vue';
-	import RefusalToRefund from './component/refusalToRefund.vue';
-	import RefundInformation from './component/refundInformation.vue';
-	import MoneyDestination from './component/moneyDestination.vue';
-	export default {
-		components: {
-			RefundInformation,
-			MoneyDestination,
-			RefundSuccessful,
-			RefundInProgress,
-			RefusalToRefund
-		},
-		data() {
-			return {
-				show: false,
-				status:1
-			};
-		},
-		methods: {
-			checkMoney() {
-				this.show = true
-			},
-			close() {
-				this.show = false
-			}
-		},
-		created() {
-			uni.setNavigationBarTitle({
-				title: "退款详情"
-			})
-		}
-	}
+import RefundSuccessful from "./component/refundSuccessful.vue";
+import RefundInProgress from "./component/refundInProgress.vue";
+import RefusalToRefund from "./component/refusalToRefund.vue";
+import RefundInformation from "./component/refundInformation.vue";
+import MoneyDestination from "./component/moneyDestination.vue";
+export default {
+  components: {
+    RefundInformation,
+    MoneyDestination,
+    RefundSuccessful,
+    RefundInProgress,
+    RefusalToRefund,
+  },
+  data() {
+    return {
+      show: false,
+      status: 1,
+      orderRefundId: "",
+      refundDetail: {},
+    };
+  },
+  onLoad(options) {
+    console.log(options);
+    this.orderRefundId = options.orderId;
+    this.getDetail();
+  },
+  methods: {
+    checkMoney() {
+      this.show = true;
+    },
+    close() {
+      this.show = false;
+    },
+    //申请平台介入
+    platformIntervene() {
+      if (this.refundDetail.goods[0].refund.status != 3) {
+        uni.$u.http
+          .post(`/api/order_refund/platform_intervention`, {
+            order_refund_id: this.refundDetail.goods[0].refund.id,
+          })
+          .then((res) => {
+            uni.showToast({
+              title: "已申请平台介入",
+              icon: "none",
+            });
+          });
+      } else {
+        uni.showToast({
+          title: "平台已介入",
+          icon: "none",
+        });
+      }
+    },
+    //获取售后订单详情
+    getDetail() {
+      uni.$u.http
+        .post(`/api/order/refund_read`, { order_refund_id: this.orderRefundId })
+        .then((res) => {
+          this.refundDetail = res;
+        });
+    },
+  },
+  created() {
+    uni.setNavigationBarTitle({
+      title: "退款详情",
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		padding: 20rpx 24rpx;
-
-
-	}
-</style>
+.page {
+  padding: 20rpx 24rpx;
+  position: relative;
+  .footer {
+    position: fixed;
+    bottom: 0;
+    padding: 20rpx 24rpx 60rpx;
+    background-color: #fff;
+    left: 0;
+    width: 94%;
+    display: flex;
+    justify-content: flex-end;
+    .btn {
+      margin: 0;
+      padding: 0;
+      background-color: #fff;
+      border: 2rpx solid #979797;
+      color: #222222;
+      border-radius: 44rpx;
+      width: 188rpx;
+      height: 78rpx;
+      line-height: 78rpx;
+      font-size: 28rpx;
+    }
+  }
+}
+</style>

+ 2 - 4
pageD/afterSalesDetail/afterSalesDetail.vue

@@ -44,7 +44,7 @@
       v-if="orderInformation.goods"
     />
     <RefusePopup :show="show" @close="close" />
-    <AgreePopup :agreeShow="agreeShow" @close="close" />
+    <AgreePopup :agreeShow="agreeShow" @close="close" title="请确认是否退款" />
 
     <view
       class="footer"
@@ -63,7 +63,7 @@
 import CommodityDetail from "./component/commodityDetail.vue";
 import ApplicationInformation from "./component/applicationInformation.vue";
 import RefusePopup from "./component/refusePopup.vue";
-import AgreePopup from "./component/agreePopup.vue";
+import AgreePopup from "../components/agreePopup.vue";
 export default {
   components: {
     CommodityDetail,
@@ -86,7 +86,6 @@ export default {
       this.show = true;
     },
     close(value) {
-      console.log(value);
       this.show = false;
       this.agreeShow = false;
     },
@@ -94,7 +93,6 @@ export default {
       uni.$u.http
         .post(`/api/order/refund_read?order_refund_id=${id}`)
         .then((res) => {
-          console.log(res);
           this.orderInformation = res;
         });
     },

+ 0 - 73
pageD/afterSalesDetail/component/agreePopup.vue

@@ -1,73 +0,0 @@
-<template>
-	<view>
-		<u-popup :show="agreeShow" @close="$emit('close')" :safeAreaInsetBottom="false" mode="center" round="10">
-			<view class="popup-content">
-				<view class="title">
-					请确认是否退款
-				</view>
-				<view class="btn-list">
-					<button class="btn-2" @click="$emit('close')">取消</button>
-					<button class="btn-1" @click="$emit('close')">提交</button>
-				</view>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	export default {
-		props:{
-			agreeShow:{
-				typeof:Boolean,
-				default:false
-			}
-		},
-		data() {
-			return {}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.popup-content{
-		padding: 36rpx 28rpx;
-		width: 450rpx;
-		.title{
-			font-size: 32rpx;
-			color: #333;
-			font-weight: 600;
-			text-align: center;
-			margin-bottom: 28rpx;
-		}
-		.btn-list{
-			display: flex;
-			justify-content: space-around;
-			.btn-1{
-				background-color: #f83224;
-				color: #fff;
-				margin-top: 40rpx;
-				border-radius: 38rpx;
-				margin: 0;
-				width: 188rpx;
-				height: 76rpx;
-				line-height: 76rpx;
-				font-size: 32rpx;
-			}
-			
-			.btn-2{
-				background-color: #fff;
-				color: #f83224;
-				margin-top: 40rpx;
-				border-radius: 38rpx;
-				border: 2rpx solid #f83224;
-				margin: 0;
-				width: 188rpx;
-				height: 76rpx;
-				line-height: 76rpx;
-				font-size: 32rpx;
-			}
-		}
-
-	}
-	
-</style>

+ 22 - 11
pageD/commodityManage/commodityManage.vue

@@ -81,7 +81,7 @@
     </view>
     <view class="footer" v-if="!batch">
       <view class="batch" @click="batchDiscount"> 批量打折 </view>
-      <!-- <button class="btn-1">上架平台商品</button> -->
+      <button class="btn-1" @click="toPlatform">上架平台商品</button>
     </view>
     <view class="footer" v-else>
       <view class="batch" @click="allSelect">
@@ -153,6 +153,7 @@ export default {
       keywords: "", //搜索关键字
       source: "",
       selectedGoods: [],
+      userId: "",
     };
   },
   computed: {
@@ -170,6 +171,15 @@ export default {
       return num;
     },
   },
+  onLoad(options) {
+    uni.getStorage({
+      key: "user_info",
+      success: ({ data }) => {
+        console.log("305", data);
+        this.userId = data.merchant.id;
+      },
+    });
+  },
   watch: {
     selectedGoods(newVal) {
       if (this.goodsLength == newVal.length) {
@@ -185,6 +195,13 @@ export default {
       this.follow = num;
       this.getCommodityList(num);
     },
+
+    //跳转平台库商品
+    toPlatform() {
+      uni.navigateTo({
+        url: `/pageD/platformProducts/platformProducts`,
+      });
+    },
     checkboxChange(e) {
       console.log(e);
     },
@@ -292,24 +309,18 @@ export default {
       this.selectGoodsInformation = value;
       this.discountsShow = true;
     },
-    toDetail() {
+    toDetail(item) {
       uni.navigateTo({
-        url: "/pageD/productDetails/productDetails",
+        url: "/pageD/productDetails/productDetails?goodsId=" + item.id,
       });
     },
     getCommodityList(status = "") {
-      let userId;
-      uni.getStorage({
-        key: "user_info",
-        success: ({ data }) => {
-          userId = data.merchant.id;
-        },
-      });
+      console.log("309", this.userId);
       uni.$u.http
         .post(`/api/goods/merchant_goods`, {
           page: 1,
           limit: 10,
-          merchant_id: userId,
+          merchant_id: this.userId,
           status: status,
           keywords: this.keywords,
           source: this.source,

+ 1 - 1
pageD/commodityManage/component/goodsInformation.vue

@@ -114,7 +114,7 @@ export default {
   background-color: #fff;
   border-radius: 16rpx;
   margin: 10rpx 0;
-  width: 96%;
+  width: 94vw;
 
   .content {
     display: flex;

+ 84 - 0
pageD/components/agreePopup.vue

@@ -0,0 +1,84 @@
+<template>
+  <view>
+    <u-popup
+      :show="agreeShow"
+      @close="$emit('close')"
+      :safeAreaInsetBottom="false"
+      mode="center"
+      round="10"
+    >
+      <view class="popup-content">
+        <view class="title"> {{ title }} </view>
+        <view class="btn-list">
+          <button class="btn-2" @click="$emit('close')">取消</button>
+          <button class="btn-1" @click="$emit('close')">提交</button>
+        </view>
+      </view>
+    </u-popup>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    agreeShow: {
+      typeof: Boolean,
+      default: false,
+    },
+    title: {
+      typeof: String,
+      default: "",
+    },
+  },
+  watch: {
+    agreeShow() {
+      console.log(111);
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.popup-content {
+  padding: 36rpx 28rpx;
+  width: 450rpx;
+  .title {
+    font-size: 32rpx;
+    color: #333;
+    font-weight: 600;
+    text-align: center;
+    margin-bottom: 28rpx;
+  }
+  .btn-list {
+    display: flex;
+    justify-content: space-around;
+    .btn-1 {
+      background-color: #f83224;
+      color: #fff;
+      margin-top: 40rpx;
+      border-radius: 38rpx;
+      margin: 0;
+      width: 188rpx;
+      height: 76rpx;
+      line-height: 76rpx;
+      font-size: 32rpx;
+    }
+
+    .btn-2 {
+      background-color: #fff;
+      color: #f83224;
+      margin-top: 40rpx;
+      border-radius: 38rpx;
+      border: 2rpx solid #f83224;
+      margin: 0;
+      width: 188rpx;
+      height: 76rpx;
+      line-height: 76rpx;
+      font-size: 32rpx;
+    }
+  }
+}
+</style>

+ 518 - 472
pageD/orderInformation/orderInformation.vue

@@ -1,479 +1,525 @@
 <template>
-	<view class="page">
-		<view class="top">
-			<view class="title">
-				{{orderTitle}}
-			</view>
-			<view class="prompt">
-				{{orderDetail}}
-			</view>
-		</view>
-		<view class="packaging" v-if="orderStauts == 4">
-			<view class="packaging-top">
-				<view class="">
-					{{"普通包裹"+"&nbsp;"+"|"+"&nbsp"+"海运散货"}}
-				</view>
-				<view style="color:#f83224;">
-					拼包中
-				</view>
-			</view>
-			<view class="packaging-center">
-				<view class="packaging-left">
-					<view class="left-top">
-						东莞仓库
-					</view>
-					<view class="left-bottom">
-							始发地
-					</view>
-				</view>
-				<image class="jiantou" src="../../static/mine/339.png" mode=""></image>
-				<view class="packaging-left">
-					<view class="left-top">
-						澳大利亚
-					</view>
-					<view class="left-bottom">
-							目的地
-					</view>
-				</view>
-			</view>
-			<view class="packaging-time">
-				<view class="time">
-					<text>开始时间:</text>
-					<text>{{"2024-5-25" + "&emsp;"}}</text>
-				</view>
-				<view class="time">
-					<text>开始时间:</text>
-					<text>2024-5-25</text>
-				</view>
-			</view>
-		</view>
-		<view class="photo" v-if="orderStauts == 1">
-			<view class="_weight"> <text>称重重量</text> <text>168kg</text> </view>
-			<view class="_weight"> <text>称重图片</text>
-				<view class="_image">
-
-				</view>
-			</view>
-			<view class="photo-bottom">
-				<text class="_text-1">需付款</text>
-				<view class="price">
-					<text style="font-size: 20rpx;">¥</text>
-					<text>133</text>.
-					<text style="font-size: 20rpx;">22</text>
-				</view>
-			</view>
-		</view>
-		<view class="address">
-			<view class="name-phone">
-				<view class="send">
-					寄
-				</view>
-				<view class="name">
-					张三
-				</view>
-				<view class="phone">
-					181****1111
-				</view>
-			</view>
-			<view class="address-detail">
-				上海市上海市浦东新区商城路1177弄5号楼201
-			</view>
-			<view class="name-phone">
-				<view class="send">
-					收
-				</view>
-				<view class="name">
-					Curtis Morris
-				</view>
-				<view class="phone">
-					181****1111
-				</view>
-			</view>
-			<view class="address-detail _bottom">
-				2A Mugga Way, Red Hill ACT 2603
-			</view>
-			<image style="height: 4rpx;margin-bottom: 40rpx;" src="../../static/mine/338.png" mode=""></image>
-
-			<view class="_label-list">
-				<view class="information">
-					<text class="_label">物品信息:</text>
-					<text class="_value">日用品</text>
-				</view>
-				<view class="information">
-					<text class="_label">件数:</text>
-					<text class="_value">20</text>
-				</view>
-				<view class="information">
-					<text class="_label">重量:</text>
-					<text class="_value">200kg</text>
-				</view>
-				<view class="information">
-					<text class="_label">类型:</text>
-					<text class="_value">特殊商品</text>
-				</view>
-				<view>
-					<text class="_label">跨境物流:</text>
-					<text class="_value">海运散货 | 1号海运柜</text>
-				</view>
-
-			</view>
-		</view>
-		<view class="num-information">
-			<view class="order" style="">
-				<text class="_label-1">订单编号</text>
-				<view class="num">
-					<text>ZT83829300113344</text>{{ "&nbsp;"+"|"+"&nbsp;" }}<text
-						@click="cope('ZT83829300113344')">复制</text>
-				</view>
-			</view>
-			<view class="order">
-				<text class="_label-1">下单时间</text>
-				<view class="num">
-					2023-11-24 22:31
-				</view>
-			</view>
-			<view class="order" v-show="orderStauts == 2">
-				<text class="_label-1">付款时间</text>
-				<view class="num">
-					2023-11-24 22:31
-				</view>
-			</view>
-		</view>
-		<view class="pay">
-			<text>已付</text>
-			<text style="color: #f83224; font-weight: 600;">123.1</text>
-		</view>
-		<view class="footer" v-if="orderStauts != 2 ">
-			<button class="btn-1" @click="toLogistics">查看物流</button>
-			<button class="btn-2" @click="toPay" v-if="orderStauts == 1">立即付款</button>
-		</view>
-	</view>
+  <view class="page">
+    <view class="top">
+      <view class="title">
+        {{ orderTitle }}
+      </view>
+      <view class="prompt">
+        {{ orderDetail }}
+      </view>
+    </view>
+    <view class="packaging" v-if="orderStauts == 4">
+      <view class="packaging-top">
+        <view class="">
+          {{ "普通包裹" + "&nbsp;" + "|" + "&nbsp" + "海运散货" }}
+        </view>
+        <view style="color: #f83224"> 拼包中 </view>
+      </view>
+      <view class="packaging-center">
+        <view class="packaging-left">
+          <view class="left-top"> 东莞仓库 </view>
+          <view class="left-bottom"> 始发地 </view>
+        </view>
+        <image class="jiantou" src="../../static/mine/339.png" mode=""></image>
+        <view class="packaging-left">
+          <view class="left-top"> 澳大利亚 </view>
+          <view class="left-bottom"> 目的地 </view>
+        </view>
+      </view>
+      <view class="packaging-time">
+        <view class="time">
+          <text>开始时间:</text>
+          <text>{{ "2024-5-25" + "&emsp;" }}</text>
+        </view>
+        <view class="time">
+          <text>开始时间:</text>
+          <text>2024-5-25</text>
+        </view>
+      </view>
+    </view>
+    <view class="photo" v-if="orderInformation.status == 'unpaid'">
+      <view class="_weight">
+        <text>称重重量</text>
+        <text>{{ orderInformation.actual_weight }}kg</text>
+      </view>
+      <view class="_weight">
+        <text>称重图片</text>
+        <!-- <view class="_image"> </view> -->
+        <image
+          :src="orderInformation.weight_images"
+          mode="scaleToFill"
+          class="_image"
+        />
+      </view>
+      <view class="photo-bottom">
+        <text class="_text-1">需付款</text>
+        <view class="price">
+          <text style="font-size: 20rpx">¥</text>
+          <text>{{ orderInformation.actual_price.split(".")[0] }}</text
+          >.
+          <text style="font-size: 20rpx">{{
+            orderInformation.actual_price.split(".")[1]
+          }}</text>
+        </view>
+      </view>
+    </view>
+    <view class="address">
+      <view class="name-phone">
+        <view class="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"> 收 </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">物品信息:</text>
+          <text class="_value">{{ item.name }}</text>
+        </view>
+        <view class="information">
+          <text class="_label">件数:</text>
+          <text class="_value">{{ item.number }}</text>
+        </view>
+        <view class="information">
+          <text class="_label">重量:</text>
+          <text class="_value">{{ item.actual_weight }}kg</text>
+        </view>
+        <view class="information">
+          <text class="_label">类型:</text>
+          <text class="_value">{{ item.type_text }}</text>
+        </view>
+        <view style="display: flex">
+          <text class="_label">跨境物流:</text>
+          <view class="_value">
+            <text
+              >{{ orderInformation.transportType.name_cn + "&nbsp;" }}
+            </text>
+            <text> | {{ orderInformation.containerBase.name }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="num-information">
+      <view class="order" style="">
+        <text class="_label-1">订单编号</text>
+        <view class="num">
+          <text>{{ orderInformation.order_no }}</text
+          >{{ "&nbsp;" + "|" + "&nbsp;"
+          }}<text @click="cope(orderInformation.order_no)">复制</text>
+        </view>
+      </view>
+      <view class="order">
+        <text class="_label-1">下单时间</text>
+        <view class="num">{{ orderInformation.created_at }} </view>
+      </view>
+      <view
+        class="order"
+        v-if="
+          (orderInformation.status == 'overseas_undelivered' ||
+            orderInformation.status == 'overseas_delivered' ||
+            orderInformation.status == 'finished') &&
+          orderInformation.status != 'domestic_delivered'
+        "
+      >
+        <text class="_label-1">付款时间</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">发货时间</text>
+        <view class="num"> 2023-11-24 22:31 </view>
+      </view>
+
+      <view class="order" v-if="orderInformation.status == 'finished'">
+        <text class="_label-1">签收时间</text>
+        <view class="num"> 2023-11-24 22:31 </view>
+      </view>
+    </view>
+    <view class="pay" v-if="orderInformation.status != 'domestic_delivered'">
+      <text>已付</text>
+      <text style="color: #f83224; font-weight: 600">123.1</text>
+    </view>
+    <view
+      class="footer"
+      v-if="
+        orderInformation.status == 'domestic_delivered' ||
+        orderInformation.status == 'overseas_delivered' ||
+        orderInformation.status == 'finished'
+      "
+    >
+      <button class="btn-1" @click="toLogistics">删除</button>
+      <button class="btn-1" @click="toLogistics">查看物流</button>
+      <button
+        class="btn-2"
+        @click="toPay"
+        v-if="orderInformation.status == 'unpaid'"
+      >
+        立即付款
+      </button>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				orderStauts: 0,
-				orderTitle: "",
-				orderDetail: ""
-			};
-		},
-		computed: {
-
-		},
-		onLoad(options) {
-			this.orderStauts = options.orderStatus
-			if (this.orderStauts == 0) {
-				//设置顶部标题栏颜色
-				uni.setNavigationBarColor({
-					frontColor: '#000000',
-					backgroundColor: '#f4f4f4'
-				})
-				this.orderDetail = "商品已寄往平台,正在运输中"
-				this.orderTitle = "待平台收货"
-			} else if (this.orderStauts == 1) {
-				//设置顶部标题栏颜色
-				uni.setNavigationBarColor({
-					frontColor: '#000000',
-					backgroundColor: '#f4f4f4'
-				})
-				this.orderDetail = "商品已打包称重,等待用户付款"
-				this.orderTitle = "待付款"
-			} else if (this.orderStauts == 2) {
-				//设置顶部标题栏颜色
-				uni.setNavigationBarColor({
-					frontColor: '#000000',
-					backgroundColor: '#f4f4f4'
-				})
-				this.orderDetail = "等待平台发货"
-				this.orderTitle = "待发货"
-			} else if (this.orderStauts == 3) {
-				//设置顶部标题栏颜色
-				uni.setNavigationBarColor({
-					frontColor: '#000000',
-					backgroundColor: '#f4f4f4'
-				})
-				this.orderDetail = "商品已发出,很快将发货至您的手中"
-				this.orderTitle = "已发货"
-			} else if (this.orderStauts == 4) {
-				//设置顶部标题栏颜色
-				uni.setNavigationBarColor({
-					frontColor: '#000000',
-					backgroundColor: '#ffffff'
-				})
-				uni.setNavigationBarTitle({
-					title:"拼包详情"
-				})
-			}
-		},
-		created() {},
-		methods: {
-			cope(str) {
-				uni.setClipboardData({
-					data: str,
-					success() {
-						uni.showToast({
-							title: "复制成功",
-							icon: "none"
-						})
-					}
-				})
-			},
-			setStatus(num) {
-				this.orderStauts = num
-			},
-			toLogistics() {
-				uni.navigateTo({
-					url: "/pageD/logisticsProgress/logisticsProgress"
-				})
-			},
-			toPay() {
-				uni.navigateTo({
-					url: "/pageD/paymentOrder/paymentOrder"
-				})
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      orderStauts: 0,
+      orderTitle: "",
+      orderDetail: "",
+      packageId: "",
+      orderInformation: {},
+    };
+  },
+  computed: {},
+  onLoad(options) {
+    this.orderStauts = options.orderStatus;
+    this.getDetail();
+  },
+  created() {},
+  methods: {
+    cope(str) {
+      uni.setClipboardData({
+        data: str,
+        success() {
+          uni.showToast({
+            title: "复制成功",
+            icon: "none",
+          });
+        },
+      });
+    },
+    setStatus(num) {
+      this.orderStauts = num;
+    },
+    toLogistics() {
+      uni.navigateTo({
+        url: "/pageD/logisticsProgress/logisticsProgress",
+      });
+    },
+    toPay() {
+      uni.navigateTo({
+        url: "/pageD/paymentOrder/paymentOrder",
+      });
+    },
+    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.orderTitle = "待平台收货";
+        } else if (this.orderInformation.status == "unpaid") {
+          //设置顶部标题栏颜色
+          uni.setNavigationBarColor({
+            frontColor: "#000000",
+            backgroundColor: "#f4f4f4",
+          });
+          this.orderDetail = "商品已打包称重,等待用户付款";
+          this.orderTitle = "待付款";
+        } else if (this.orderInformation.status == "overseas_undelivered") {
+          //设置顶部标题栏颜色
+          uni.setNavigationBarColor({
+            frontColor: "#000000",
+            backgroundColor: "#f4f4f4",
+          });
+          this.orderDetail = "等待平台发货";
+          this.orderTitle = "待发货";
+        } else if (this.orderInformation.status == "overseas_delivered") {
+          //设置顶部标题栏颜色
+          uni.setNavigationBarColor({
+            frontColor: "#000000",
+            backgroundColor: "#f4f4f4",
+          });
+          this.orderDetail = "商品已发出,很快将发货至您的手中";
+          this.orderTitle = "已发货";
+        } else if (this.orderStauts == 4) {
+          //设置顶部标题栏颜色
+          uni.setNavigationBarColor({
+            frontColor: "#000000",
+            backgroundColor: "#ffffff",
+          });
+          uni.setNavigationBarTitle({
+            title: "拼包详情",
+          });
+        } else if (this.orderInformation.status == "finished") {
+          //设置顶部标题栏颜色
+          uni.setNavigationBarColor({
+            frontColor: "#000000",
+            backgroundColor: "#f4f4f4",
+          });
+          this.orderDetail = "订单签收,交易已完成";
+          this.orderTitle = "已完成";
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		padding: 20rpx 24rpx;
-		position: relative;
-
-		.title {
-			font-size: 44rpx;
-			color: #222;
-			font-weight: 600;
-		}
-
-		.prompt {
-			font-size: 24rpx;
-			color: rgba(34, 34, 34, .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, .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, .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, .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, .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;
+
+  .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>

+ 33 - 10
pageD/productDetails/productDetails.vue

@@ -1,16 +1,21 @@
 <template>
   <view class="page">
-    <view v-if="pageStatus != 'platform'">
-      <view class="top-fail" v-if="status != 2">
+    <!-- v-if="pageStatus != 'platform'" -->
+    <view v-if="commodityDetail.final_status != 'normal'">
+      <view class="top-fail" v-if="commodityDetail.final_status != 'unreview'">
         <image
           src="../../static/mine/332.png"
           class="fail-icon"
           mode=""
         ></image>
-        <text v-if="status == 1">涉及敏感文字,您发布的商品审核未通过</text>
-        <text v-if="status == 3">该商品已下架,如有需要请重新上架</text>
+        <text v-if="commodityDetail.final_status == 'refuse'"
+          >涉及敏感文字,您发布的商品审核未通过</text
+        >
+        <text v-else-if="commodityDetail.final_status == 'down'"
+          >该商品已下架,如有需要请重新上架</text
+        >
       </view>
-      <view class="fail" v-else>
+      <view class="fail" v-if="commodityDetail.final_status == 'unreview'">
         <image
           src="../../static/mine/333.png"
           class="fail-icon"
@@ -38,18 +43,27 @@
     <view class="goods-detail"> 商品详情 </view>
     <view class="detail">
       <!-- -->
-      <!-- <view v-html="commodityDetail.detail_cn"></view> -->
-      <image
+      <view v-html="commodityDetail.detail_cn"></view>
+      <!-- <image
         class="detail-img"
         v-for="item in commodityDetail.images.split(',')"
         :src="item"
         mode=""
-      ></image>
+      ></image> -->
     </view>
 
     <view class="footer">
       <!-- <button class="btn">编辑商品</button> -->
-      <button class="btn" @click="groundingCommodity">上架商品</button>
+      <button
+        class="btn"
+        @click="groundingCommodity"
+        v-if="
+          commodityDetail.final_status == 'normal' ||
+          commodityDetail.final_status == 'down'
+        "
+      >
+        上架商品
+      </button>
     </view>
   </view>
 </template>
@@ -69,9 +83,12 @@ export default {
     this.pageStatus = options.pageStatus;
     if (options.pageStatus == "platform") {
       this.getGoodsDetail();
+    } else {
+      this.getGoodsManageDetail();
     }
   },
   methods: {
+    //获取平台库商品详情
     getGoodsDetail() {
       uni.$u.http
         .get(`/api/goods/platform_goods_details/${this.goodsId}`)
@@ -79,6 +96,12 @@ export default {
           this.commodityDetail = res;
         });
     },
+    //获取商品管理商品详情
+    getGoodsManageDetail() {
+      uni.$u.http.get(`/api/goods/detail/${this.goodsId}`).then((res) => {
+        this.commodityDetail = res;
+      });
+    },
     //上架商品
     groundingCommodity() {
       uni.$u.http
@@ -99,7 +122,7 @@ export default {
 <style lang="scss" scoped>
 .page {
   background-color: #fff;
-
+  padding-bottom: 150rpx;
   .top-fail {
     height: 60rpx;
     background-color: #fff1ee;

+ 124 - 98
pages/mine/component/mallOrderForm.vue

@@ -1,105 +1,131 @@
 <template>
-	<!-- 商城订单 -->
-	<view class="mall">
-		<view class="mall-top"> <text class="mall-title">{{i18n.mallOrders}}</text>
-			<view class="all" @click="toOrderFrom(1)"> <text>{{i18n.whole}}</text>
-				<image class="right" src='../../../static/mine/right.png' mode=""></image>
-			</view>
-		</view>
-		<view class="order-form">
-			<view class="icon-center" @click="toOrderFrom(2)">
-				<image class="form-icon" src='../../../static/mine/310.png' mode=""></image>
-				<view class="characters">{{i18n.pendingPayment}}</view>
-			</view>
-			<view class="icon-center" @click="toOrderFrom(3)">
-				<image class="form-icon" src='../../../static/mine/311.png' mode=""></image>
-				<view class="characters">{{i18n.joiningGroups}}</view>
-			</view>
-			<view class="icon-center" @click="toOrderFrom(4)">
-				<image class="form-icon" src='../../../static/mine/312.png' mode=""></image>
-				<view class="characters">{{i18n.toBeShipped}}</view>
-			</view>
-			<view class="icon-center" @click="toOrderFrom(5)">
-				<image class="form-icon" src='../../../static/mine/313.png' mode=""></image>
-				<view class="characters">{{i18n.toBeReceived}}</view>
-			</view>
-			<view class="icon-center" @click="toOrderFrom(7)">
-				<image class="form-icon" src='../../../static/mine/314.png' mode=""></image>
-				<view class="characters">{{i18n.refund}}</view>
-			</view>
-		</view>
-	</view>
+  <!-- 商城订单 -->
+  <view class="mall">
+    <view class="mall-top">
+      <text class="mall-title">{{ i18n.mallOrders }}</text>
+      <view class="all" @click="toOrderFrom('')">
+        <text>{{ i18n.whole }}</text>
+        <image
+          class="right"
+          src="../../../static/mine/right.png"
+          mode=""
+        ></image>
+      </view>
+    </view>
+    <view class="order-form">
+      <view class="icon-center" @click="toOrderFrom('unpaid')">
+        <image
+          class="form-icon"
+          src="../../../static/mine/310.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.pendingPayment }}</view>
+      </view>
+      <view class="icon-center" @click="toOrderFrom('unreview')">
+        <image
+          class="form-icon"
+          src="../../../static/mine/311.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.joiningGroups }}</view>
+      </view>
+      <view class="icon-center" @click="toOrderFrom('undelivered')">
+        <image
+          class="form-icon"
+          src="../../../static/mine/312.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.toBeShipped }}</view>
+      </view>
+      <view class="icon-center" @click="toOrderFrom('delivered')">
+        <image
+          class="form-icon"
+          src="../../../static/mine/313.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.toBeReceived }}</view>
+      </view>
+      <view class="icon-center" @click="toOrderFrom('refund')">
+        <image
+          class="form-icon"
+          src="../../../static/mine/314.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.refund }}</view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data(){
-			return {}
-		},
-		computed:{
-			i18n(){
-				return this.$t('index')
-			}
-		},
-		methods:{
-			toOrderFrom(num){
-				uni.navigateTo({
-					url:`/pageC/orderForm/orderForm?followId=${num}`
-				})
-			}
-		}
-	}
+export default {
+  data() {
+    return {};
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    toOrderFrom(num) {
+      uni.navigateTo({
+        url: `/pageC/orderForm/orderForm?followId=${num}`,
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	.mall{
-		height: 100px;
-		width: 100%;
-		background-color: #fff;
-		border-radius: 10px;
-		padding-top: 14px;
-		margin-top: 10px;
-		.mall-top{
-			display: flex;
-			justify-content: space-between;
-			margin: 0 10px;
-			.mall-title{
-				font-size: 14px;
-				color: #222;
-				font-weight: 600;
-			}
-			.all{
-				color: #333;
-				font-size: 12px;
-				display: flex;
-				align-items: center;
-				.right{
-					width: 10px;
-					height: 10px;
-				}
-			}
-		}
-		.order-form{
-			display: flex;
-			justify-content: space-around;
-			margin-top: 18px;
-			.icon-center{
-				width: 15%;
-				display: flex;
-				flex-wrap: wrap;
-				justify-content: center;
-				flex-direction: column;
-				align-items: center;
-			}
-			.form-icon{
-				width: 24px;
-				height: 22px;
-			}
-			.characters{
-				color: #202020;
-				font-size: 12px;
-				margin-top: 10px;
-			}
-		}
-	}
-</style>
+.mall {
+  height: 100px;
+  width: 100%;
+  background-color: #fff;
+  border-radius: 10px;
+  padding-top: 14px;
+  margin-top: 10px;
+  .mall-top {
+    display: flex;
+    justify-content: space-between;
+    margin: 0 10px;
+    .mall-title {
+      font-size: 14px;
+      color: #222;
+      font-weight: 600;
+    }
+    .all {
+      color: #333;
+      font-size: 12px;
+      display: flex;
+      align-items: center;
+      .right {
+        width: 10px;
+        height: 10px;
+      }
+    }
+  }
+  .order-form {
+    display: flex;
+    justify-content: space-around;
+    margin-top: 18px;
+    .icon-center {
+      width: 15%;
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: center;
+      flex-direction: column;
+      align-items: center;
+    }
+    .form-icon {
+      width: 24px;
+      height: 22px;
+    }
+    .characters {
+      color: #202020;
+      font-size: 12px;
+      margin-top: 10px;
+    }
+  }
+}
+</style>

文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageD/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map


文件差異過大導致無法顯示
+ 21 - 22
unpackage/dist/dev/mp-weixin/common/main.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/runtime.js


文件差異過大導致無法顯示
+ 354 - 315
unpackage/dist/dev/mp-weixin/common/vendor.js


文件差異過大導致無法顯示
+ 31 - 32
unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js


+ 29 - 29
unpackage/dist/dev/mp-weixin/pageA/index.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageA/index"],{
 
 /***/ 214:
-/*!***********************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageA%2Findex"} ***!
-  \***********************************************************************************/
+/*!**********************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageA%2Findex"} ***!
+  \**********************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_index.default);
 /***/ }),
 
 /***/ 215:
-/*!******************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue ***!
-  \******************************************************************/
+/*!*****************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageA/index.vue ***!
+  \*****************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -33,7 +33,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=156d5177& */ 216);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 218);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -42,7 +42,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -61,31 +61,31 @@ component.options.__file = "pageA/index.vue"
 /***/ }),
 
 /***/ 216:
-/*!*************************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue?vue&type=template&id=156d5177& ***!
-  \*************************************************************************************************/
+/*!************************************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=template&id=156d5177& ***!
+  \************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=156d5177& */ 217);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=156d5177& */ 217);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["components"]; });
 
 
 
 /***/ }),
 
 /***/ 217:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue?vue&type=template&id=156d5177& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=template&id=156d5177& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -110,25 +110,25 @@ render._withStripped = true
 /***/ }),
 
 /***/ 218:
-/*!*******************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue?vue&type=script&lang=js& ***!
-  \*******************************************************************************************/
+/*!******************************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=script&lang=js& ***!
+  \******************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 219);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 219);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
 /***/ 219:
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=script&lang=js& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

+ 29 - 29
unpackage/dist/dev/mp-weixin/pageB/index.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageB/index"],{
 
 /***/ 338:
-/*!***********************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
-  \***********************************************************************************/
+/*!**********************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
+  \**********************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_index.default);
 /***/ }),
 
 /***/ 339:
-/*!******************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue ***!
-  \******************************************************************/
+/*!*****************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageB/index.vue ***!
+  \*****************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -33,7 +33,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=ab5bf790& */ 340);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 342);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -42,7 +42,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -61,31 +61,31 @@ component.options.__file = "pageB/index.vue"
 /***/ }),
 
 /***/ 340:
-/*!*************************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
-  \*************************************************************************************************/
+/*!************************************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
+  \************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 341);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 341);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["components"]; });
 
 
 
 /***/ }),
 
 /***/ 341:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -110,25 +110,25 @@ render._withStripped = true
 /***/ }),
 
 /***/ 342:
-/*!*******************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
-  \*******************************************************************************************/
+/*!******************************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
+  \******************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 343);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 343);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
 /***/ 343:
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

+ 29 - 29
unpackage/dist/dev/mp-weixin/pageC/index.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageC/index"],{
 
 /***/ 454:
-/*!***********************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
-  \***********************************************************************************/
+/*!**********************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
+  \**********************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_index.default);
 /***/ }),
 
 /***/ 455:
-/*!******************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue ***!
-  \******************************************************************/
+/*!*****************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageC/index.vue ***!
+  \*****************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -33,7 +33,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=3f36b6f9& */ 456);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 458);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -42,7 +42,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -61,31 +61,31 @@ component.options.__file = "pageC/index.vue"
 /***/ }),
 
 /***/ 456:
-/*!*************************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
-  \*************************************************************************************************/
+/*!************************************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
+  \************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 457);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 457);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["components"]; });
 
 
 
 /***/ }),
 
 /***/ 457:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -110,25 +110,25 @@ render._withStripped = true
 /***/ }),
 
 /***/ 458:
-/*!*******************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
-  \*******************************************************************************************/
+/*!******************************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
+  \******************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 459);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 459);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
 /***/ 459:
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

+ 29 - 29
unpackage/dist/dev/mp-weixin/pageD/index.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageD/index"],{
 
 /***/ 642:
-/*!***********************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
-  \***********************************************************************************/
+/*!**********************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
+  \**********************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_index.default);
 /***/ }),
 
 /***/ 643:
-/*!******************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue ***!
-  \******************************************************************/
+/*!*****************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageD/index.vue ***!
+  \*****************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -33,7 +33,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=57c92c8c& */ 644);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 646);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -42,7 +42,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -61,31 +61,31 @@ component.options.__file = "pageD/index.vue"
 /***/ }),
 
 /***/ 644:
-/*!*************************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
-  \*************************************************************************************************/
+/*!************************************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
+  \************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 645);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 645);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["components"]; });
 
 
 
 /***/ }),
 
 /***/ 645:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -110,25 +110,25 @@ render._withStripped = true
 /***/ }),
 
 /***/ 646:
-/*!*******************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
-  \*******************************************************************************************/
+/*!******************************************************************************!*\
+  !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
+  \******************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 647);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 647);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
 /***/ 647:
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

文件差異過大導致無法顯示
+ 32 - 33
unpackage/dist/dev/mp-weixin/pages/cart/cart.js


文件差異過大導致無法顯示
+ 32 - 33
unpackage/dist/dev/mp-weixin/pages/express/express.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/express/express.wxml


文件差異過大導致無法顯示
+ 32 - 33
unpackage/dist/dev/mp-weixin/pages/index/index.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


文件差異過大導致無法顯示
+ 32 - 33
unpackage/dist/dev/mp-weixin/pages/login/login.js


文件差異過大導致無法顯示
+ 32 - 33
unpackage/dist/dev/mp-weixin/pages/mine/mine.js


文件差異過大導致無法顯示
+ 32 - 33
unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js


文件差異過大導致無法顯示
+ 29 - 30
unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js


文件差異過大導致無法顯示
+ 29 - 30
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js


文件差異過大導致無法顯示
+ 29 - 30
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js


文件差異過大導致無法顯示
+ 29 - 30
unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js


文件差異過大導致無法顯示
+ 39 - 40
unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js


文件差異過大導致無法顯示
+ 30 - 31
unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js


文件差異過大導致無法顯示
+ 39 - 40
unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js


文件差異過大導致無法顯示
+ 39 - 40
unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js


文件差異過大導致無法顯示
+ 29 - 30
unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.js


文件差異過大導致無法顯示
+ 39 - 40
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js


文件差異過大導致無法顯示
+ 31 - 32
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js


文件差異過大導致無法顯示
+ 39 - 40
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js


文件差異過大導致無法顯示
+ 40 - 41
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js


文件差異過大導致無法顯示
+ 29 - 30
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.js


部分文件因文件數量過多而無法顯示