增加我的包裹支付页

pageC/applicationRefund/applicationRefund.vue

@@ -162,10 +162,14 @@ export default {
           order_goods_id: this.orderId,
           refund_reason: this.refundText,
           refund_illustrate: this.value1,
-          image: this.imgList.join(","),
+          images: this.imgList.join(","),
         })
         .then((res) => {
-          console.log(res);
+          uni.showToast({
+            title: "已申请",
+            icon: "none",
+          });
+          uni.navigateBack({ delta: 1 });
         });
     },
   },

pageC/myPackage/component/packageCard.vue

@@ -129,7 +129,7 @@ export default {
     },
     toPayment() {
       uni.navigateTo({
-        url: "/pageD/paymentOrder/paymentOrder",
+        url: `/pageD/paymentOrder/paymentOrder?money=${this.itemInfo.actual_price}&weight=${this.itemInfo.actual_weight}&type=${this.itemInfo.goods[0].type_text}&num=${this.itemInfo.goods[0].number}&orderid=${this.itemInfo.id}`,
       });
     },
     toSending() {

pageC/myPackage/myPackage.vue

@@ -47,7 +47,7 @@
           src="../../static/mine/336.png"
           mode=""
         ></image>
-        当前页面加载的订单总重量300kg
+        当前页面加载的订单总重量{{ weights }}kg
       </view>
       <view v-for="item in orderList" :key="item.orderStatus">
         <PackageCard :itemInfo="item" @toInformation="toInformation" />
@@ -82,6 +82,9 @@ export default {
     this.follow = options.type || "to_transit";
     this.getPackageList(1);
   },
+  onShow() {
+    this.getPackageList(1);
+  },
   methods: {
     tabSwitch(num) {
       this.page = 1;

pageC/orderForm/orderForm.vue

@@ -143,9 +143,8 @@ export default {
 
     //拼团中售后
     unreviewAfter(value) {
-      console.log(value);
       uni.navigateTo({
-        url: `/pageC/applicationRefund/applicationRefund?orderId=${value.goods_id}`,
+        url: `/pageC/applicationRefund/applicationRefund?orderId=${value.id}`,
       });
     },
     //确认收货

pageD/commodityManage/component/goodsInformation.vue

@@ -2,7 +2,7 @@
   <view class="detail" @click="$emit('toDetail', itemInfo)" :style="isPadding">
     <view class="content">
       <image :src="itemInfo.goods.image" mode="" class="content-img"></image>
-      <view class="mask" v-if="itemInfo.status == 'down'">
+      <view class="mask" v-if="itemInfo.goods.status == 'down'">
         <view class="text-1"> 已下架 </view>
       </view>
       <view class="content-right">

pageD/orderDetail/orderDetail.vue

@@ -27,17 +27,19 @@
         class="logistics"
         v-if="
           orderDetail.simplify_status == 'merdelivered' ||
-          orderDetail.simplify_status == 'delivered'
+          orderDetail.simplify_status == 'delivered' ||
+          orderDetail.simplify_status == 'undelivered'
         "
       >
         <text class="_label">物流单号</text>
         <view class="num">
-          <text>{{ orderDetail.delivery_company }}</text>
+          <text>{{ orderDetail.delivery_company || "暂无填写物流公司" }}</text>
           <text>{{ "&nbsp;" + "|" + "&nbsp;" }}</text>
-          <text>{{ orderDetail.delivery_no }}</text>
+          <text>{{ orderDetail.delivery_no || "暂无填写物流单号" }}</text>
           <image
             class="cope-icon"
             src="../../static/mine/349.png"
+            @click="cope(orderDetail.delivery_no)"
             mode=""
           ></image>
         </view>
@@ -113,6 +115,13 @@
       >
         查看物流
       </button>
+      <button
+        class="status-2"
+        v-if="orderDetail.simplify_status == 'undifference'"
+        @click="toPayOrder"
+      >
+        立即付款
+      </button>
     </view>
   </view>
 </template>
@@ -195,6 +204,13 @@ export default {
         url: `/pageA/payorder?num=${this.orderDetail.earnest_money}&orderid=${this.orderDetail.id}`,
       });
     },
+
+    //跳转支付
+    toPayOrder() {
+      uni.navigateTo({
+        url: `/pageA/payorder?num=${this.orderDetail.fill_price}&orderid=${this.orderDetail.id}`,
+      });
+    },
     //跳转发货页面
     toSendOutGoods() {
       uni.navigateTo({

pageD/orderInformation/orderInformation.vue

@@ -316,7 +316,7 @@ export default {
     //去支付
     toPay() {
       uni.navigateTo({
-        url: "/pageD/paymentOrder/paymentOrder",
+        url: `/pageD/paymentOrder/paymentOrder?money=${this.orderInformation.actual_price}&weight=${this.orderInformation.goods[0].actual_weight}&type=${this.orderInformation.goods[0].type_text}&num=${this.orderInformation.goods[0].number}&orderid=${this.orderInformation.id}`,
       });
     },
     getDetail() {

pageD/paymentOrder/paymentOrder.vue

@@ -1,204 +1,413 @@
 <template>
-	<view class="page">
-		<view class="_top">
-			<view class="title">
-				待支付订单
-			</view>
-			<view class="price">
-				<text class="_text-1">￥</text>
-				1235.2
-			</view>
-			<view class="_weight">
-				<text>实际重量</text>
-				<text>168kg</text>
-			</view>
-			<view class="type-num">
-				<text>包裹类型</text>
-				<text>日用品</text>
-			</view>
-			<view class="type-num">
-				<text>包裹数量</text>
-				<text>5</text>
-			</view>
-		</view>
-		<view class="pay" @click="switchType('balance')">
-			<view style="display: flex;">
-				<image class="balance-icon" src="../../static/mine/341.png" mode=""></image>
-				<view class="">
-					<view style="font-size: 26rpx; color: #333333;">余额支付</view>
-					<view style="color: #f83224;font-size: 24rpx;margin-top: 10rpx;">当前余额：2546.2</view>
-				</view>
-			</view>
-			<image v-if="payType == 'balance'" class="select" src="../../static/mine/342.png" mode=""></image>
-			<image v-else class="select" src="../../static/mine/345.png" mode=""></image>
-		</view>
-		<view class="pay" @click="switchType('wx')">
-			<view style="display: flex;">
-				<image class="balance-icon" src="../../static/mine/343.png" mode=""></image>
-				<view class="">
-					<view style="font-size: 26rpx; color: #333333;">微信支付</view>
-					<view style="color: #797979;font-size: 24rpx;margin-top: 10rpx;">适用微信支付</view>
-				</view>
-			</view>
-			<image v-if="payType == 'wx'" class="select" src="../../static/mine/342.png" mode=""></image>
-			<image v-else class="select" src="../../static/mine/345.png" mode=""></image>
-		</view>
-		<view class="pay" @click="switchType('service')">
-			<view style="display: flex;">
-				<image class="balance-icon" src="../../static/mine/344.png" mode=""></image>
-				<view class="">
-					<view style="font-size: 26rpx; color: #333333;">客服支付</view>
-					<view style="color: #797979;font-size: 24rpx;margin-top: 10rpx;">联系微信支付</view>
-				</view>
-			</view>
-			<image v-if="payType == 'service'" class="select" src="../../static/mine/342.png" mode=""></image>
-			<image v-else class="select" src="../../static/mine/345.png" mode=""></image>
-		</view>
+  <view class="page">
+    <view class="_top">
+      <view class="select">
+        <uni-section title="本地数据" type="line">
+          <uni-data-select
+            v-model="value"
+            :localdata="exchangeList"
+            @change="change"
+            :clear="false"
+          ></uni-data-select>
+        </uni-section>
+      </view>
+      <view class="title"> 待支付订单 </view>
+      <view class="price">
+        <text class="_text-1">￥</text>
+        {{ goodsDetail.money }}
+      </view>
+      <view class="_weight">
+        <text>实际重量</text>
+        <text> {{ goodsDetail.weight }} kg</text>
+      </view>
+      <view class="type-num">
+        <text>包裹类型</text>
+        <text>{{ goodsDetail.type }}</text>
+      </view>
+      <view class="type-num">
+        <text>包裹数量</text>
+        <text>{{ goodsDetail.num }}</text>
+      </view>
+    </view>
+    <view class="pay" @click="switchType('balance')">
+      <view style="display: flex">
+        <image
+          class="balance-icon"
+          src="../../static/mine/341.png"
+          mode=""
+        ></image>
+        <view class="">
+          <view style="font-size: 26rpx; color: #333333">余额支付</view>
+          <view style="color: #f83224; font-size: 24rpx; margin-top: 10rpx"
+            >当前余额：{{ balance }}</view
+          >
+        </view>
+      </view>
+      <image
+        v-if="payType == 'balance'"
+        class="select"
+        src="../../static/mine/342.png"
+        mode=""
+      ></image>
+      <image
+        v-else
+        class="select"
+        src="../../static/mine/345.png"
+        mode=""
+      ></image>
+    </view>
+    <view class="pay" @click="switchType('wechat')">
+      <view style="display: flex">
+        <image
+          class="balance-icon"
+          src="../../static/mine/343.png"
+          mode=""
+        ></image>
+        <view class="">
+          <view style="font-size: 26rpx; color: #333333">微信支付</view>
+          <view style="color: #797979; font-size: 24rpx; margin-top: 10rpx"
+            >适用微信支付</view
+          >
+        </view>
+      </view>
+      <image
+        v-if="payType == 'wechat'"
+        class="select"
+        src="../../static/mine/342.png"
+        mode=""
+      ></image>
+      <image
+        v-else
+        class="select"
+        src="../../static/mine/345.png"
+        mode=""
+      ></image>
+    </view>
+    <view class="pay" @click="switchType('customer')">
+      <view style="display: flex">
+        <image
+          class="balance-icon"
+          src="../../static/mine/344.png"
+          mode=""
+        ></image>
+        <view class="">
+          <view style="font-size: 26rpx; color: #333333">客服支付</view>
+          <view style="color: #797979; font-size: 24rpx; margin-top: 10rpx"
+            >联系微信支付</view
+          >
+        </view>
+      </view>
+      <image
+        v-if="payType == 'customer'"
+        class="select"
+        src="../../static/mine/342.png"
+        mode=""
+      ></image>
+      <image
+        v-else
+        class="select"
+        src="../../static/mine/345.png"
+        mode=""
+      ></image>
+    </view>
 
-		<view class="footer">
-			<view class="_view">
-				<text class="_text-1">共一件</text>
-				<text class="_text-2">{{"&nbsp;"+"合计"}}</text>
-				<view class="price">
-					<text style="font-size: 20rpx;">￥</text>
-					<text>133</text>.
-					<text style="font-size: 20rpx;">22</text>
-				</view>
-			</view>
-			<button class="btn-2" @click="toPay">立即支付</button>
-		</view>
-	</view>
+    <view class="footer">
+      <view class="_view">
+        <text class="_text-1">共一件</text>
+        <text class="_text-2">{{ "&nbsp;" + "合计" }}</text>
+        <view class="price" v-if="goodsDetail.money">
+          <text style="font-size: 20rpx">￥</text>
+          <text>{{ goodsDetail.money.split(".")[0] }}</text
+          >.
+          <text style="font-size: 20rpx">{{
+            goodsDetail.money.split(".")[1]
+          }}</text>
+        </view>
+      </view>
+      <button class="btn-2" @click="payment">立即支付</button>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				payType: "balance"
-			};
-		},
-		methods: {
-			switchType(str) {
-				this.payType = str
-			}
-		},
-		created() {
-			uni.setNavigationBarTitle({
-				title: "支付订单"
-			})
-		}
-	}
+export default {
+  data() {
+    return {
+      payType: "balance",
+      goodsDetail: {},
+      exchangeList: [], //汇率列表
+      value: "",
+      balance: "",
+      balance1: 0,
+    };
+  },
+  onLoad(options) {
+    this.goodsDetail = options;
+    this.money = options.money;
+  },
+  methods: {
+    switchType(str) {
+      this.payType = str;
+    },
+    change(e) {
+      this.calculate();
+      this.calculate1(this.balance1);
+    },
+
+    //用户信息
+    userinfo() {
+      uni.$u.http
+        .get("/api/member/info", {})
+        .then((res) => {
+          this.balance = res.balance;
+          this.balance1 = this.balance;
+          this.calculate1(this.balance1);
+        })
+        .catch(() => {});
+    },
+
+    //汇率价格
+    calculate() {
+      uni.$u.http
+        .post("/api/exchange-rate/calculate/" + this.value, {
+          price: this.money,
+        })
+        .then((res) => {
+          this.goodsDetail.money = res.amount;
+        })
+        .catch(() => {});
+    },
+    calculate1(balance) {
+      uni.$u.http
+        .post("/api/exchange-rate/calculate/" + this.value, {
+          price: balance,
+        })
+        .then((res) => {
+          this.balance = res.amount;
+        })
+        .catch(() => {});
+    },
+    ratelist() {
+      uni.$u.http
+        .get("/api/exchange-rate", {})
+        .then((res) => {
+          //   this.exchangeList = res.reverse();
+          console.log(res);
+          res.map((item) => {
+            let obj = {};
+            obj.text = item.name_cn;
+            obj.value = item.id;
+            this.exchangeList.push(obj);
+          });
+          this.exchangeList = this.exchangeList.reverse();
+          this.value = this.exchangeList[0].value;
+        })
+        .catch(() => {});
+    },
+    //支付
+    payment() {
+      //   if (this.type == "") {
+      uni.$u.http
+        .post("/api/order/payment", {
+          order_id: this.goodsDetail.orderid,
+          pay_type: this.payType,
+          customer_currency: "RMB",
+        })
+        .then((res) => {
+          console.log(res);
+          if (this.payType == "wechat") {
+            uni.requestPayment({
+              provider: "wxpay",
+              timeStamp: String(res.timeStamp),
+              nonceStr: res.nonceStr,
+              package: res.package,
+              signType: res.signType,
+              paySign: res.paySign,
+              success: function (res) {
+                this.$u.toast("支付成功");
+                console.log("success:" + JSON.stringify(res));
+                setTimeout(() => {}, 800);
+              },
+              fail: function (err) {
+                console.log("fail:" + JSON.stringify(err));
+              },
+            });
+          }
+        })
+        .catch(() => {});
+      //   } else {
+      //     uni.$u.http
+      //       .post("/api/pay", {
+      //         order_id: this.orderid,
+      //         pay_type: this.pay_type,
+      //         type: this.type,
+      //         exchange_rate_id: this.exchange_rate_id,
+      //       })
+      //       .then((res) => {
+      //         if (this.pay_type == "wechat") {
+      //           uni.requestPayment({
+      //             provider: "wxpay",
+      //             timeStamp: String(res.timeStamp),
+      //             nonceStr: res.nonceStr,
+      //             package: res.package,
+      //             signType: res.signType,
+      //             paySign: res.paySign,
+      //             success: function (res) {
+      //               console.log("success:" + JSON.stringify(res));
+      //               setTimeout(() => {
+      //                 uni.switchTab({
+      //                   url: "/pages/express/express",
+      //                 });
+      //               }, 800);
+      //             },
+      //             fail: function (err) {
+      //               console.log("fail:" + JSON.stringify(err));
+      //             },
+      //           });
+      //         } else {
+      //           this.$u.toast("支付成功");
+      //           setTimeout(() => {
+      //             uni.switchTab({
+      //               url: "/pages/express/express",
+      //             });
+      //           }, 800);
+      //         }
+      //         // uni.navigateTo({
+      //         // 	url: 'confirm'
+      //         // })
+      //       })
+      //       .catch(() => {});
+      //   }
+    },
+  },
+  created() {
+    this.ratelist();
+    this.userinfo();
+    uni.setNavigationBarTitle({
+      title: "支付订单",
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		padding: 20rpx 24rpx;
-		position: relative;
+.page {
+  padding: 20rpx 24rpx;
+  position: relative;
 
-		._top {
-			padding: 48rpx 24rpx 36rpx;
-			background-color: #fff;
-			border-radius: 16rpx;
+  ._top {
+    padding: 48rpx 24rpx 36rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+    position: relative;
+    .select {
+      position: absolute;
+      right: 14rpx;
+      top: 14rpx;
+      width: 200rpx;
+      height: 50rpx;
+      //   background-color: #ccc;
+    }
 
-			.title {
-				text-align: center;
-				color: rgba(34, 34, 34, .7);
-				font-size: 28rpx;
-			}
+    .title {
+      text-align: center;
+      color: rgba(34, 34, 34, 0.7);
+      font-size: 28rpx;
+    }
 
-			.price {
-				font-size: 64rpx;
-				font-weight: 500;
-				text-align: center;
-				margin-top: 20rpx;
+    .price {
+      font-size: 64rpx;
+      font-weight: 500;
+      text-align: center;
+      margin-top: 20rpx;
 
-				._text-1 {
-					font-size: 28rpx;
-				}
-			}
+      ._text-1 {
+        font-size: 28rpx;
+      }
+    }
 
-			._weight {
-				display: flex;
-				justify-content: space-between;
-				margin-top: 46rpx;
-				font-size: 28rpx;
-				color: rgba(34, 34, 34, 1);
-			}
+    ._weight {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 46rpx;
+      font-size: 28rpx;
+      color: rgba(34, 34, 34, 1);
+    }
 
-			.type-num {
-				display: flex;
-				justify-content: space-between;
-				font-size: 28rpx;
-				color: rgba(34, 34, 34, .7);
-				margin-top: 32rpx;
-			}
-		}
+    .type-num {
+      display: flex;
+      justify-content: space-between;
+      font-size: 28rpx;
+      color: rgba(34, 34, 34, 0.7);
+      margin-top: 32rpx;
+    }
+  }
 
-		.pay {
-			display: flex;
-			align-items: center;
-			background-color: #fff;
-			margin-top: 20rpx;
-			height: 140rpx;
-			border-radius: 16rpx;
-			padding: 0 24rpx;
-			justify-content: space-between;
+  .pay {
+    display: flex;
+    align-items: center;
+    background-color: #fff;
+    margin-top: 20rpx;
+    height: 140rpx;
+    border-radius: 16rpx;
+    padding: 0 24rpx;
+    justify-content: space-between;
 
-			.balance-icon {
-				width: 40rpx;
-				height: 40rpx;
-				margin-right: 20rpx;
-			}
+    .balance-icon {
+      width: 40rpx;
+      height: 40rpx;
+      margin-right: 20rpx;
+    }
 
-			.select {
-				width: 36rpx;
-				height: 36rpx;
-			}
-		}
+    .select {
+      width: 36rpx;
+      height: 36rpx;
+    }
+  }
 
-		.footer {
-			display: flex;
-			justify-content: flex-end;
-			background-color: #fff;
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			width: 100%;
-			height: 146rpx;
-			padding-top: 20rpx;
-			._view{
-				display: flex;
-				align-items: flex-end;
-				height: 76rpx;
-				._text-1{
-					font-size: 24rpx;
-					color: rgba(51, 51, 51, .8);
-					display: inline-block;
-					padding-bottom: 10rpx;
-				}
-				._text-2{
-					font-size: 24rpx;
-					display: inline-block;
-					padding-bottom: 10rpx;
-				}
-				.price{
-					color: #f83224;
-					font-weight: 600;
-					font-size: 48rpx;
-				}
-			}
-			.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;
-				margin-left: 20rpx;
-			}
-		}
-	}
-</style>
+  .footer {
+    display: flex;
+    justify-content: flex-end;
+    background-color: #fff;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 146rpx;
+    padding-top: 20rpx;
+    ._view {
+      display: flex;
+      align-items: flex-end;
+      height: 76rpx;
+      ._text-1 {
+        font-size: 24rpx;
+        color: rgba(51, 51, 51, 0.8);
+        display: inline-block;
+        padding-bottom: 10rpx;
+      }
+      ._text-2 {
+        font-size: 24rpx;
+        display: inline-block;
+        padding-bottom: 10rpx;
+      }
+      .price {
+        color: #f83224;
+        font-weight: 600;
+        font-size: 48rpx;
+      }
+    }
+    .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;
+      margin-left: 20rpx;
+    }
+  }
+}
+</style>

uni_modules/uni-data-select/changelog.md

@@ -0,0 +1,39 @@
+## 1.0.8（2024-03-28）
+- 修复 在vue2下:style动态绑定导致编译失败的bug
+## 1.0.7（2024-01-20）
+- 修复 长文本回显超过容器的bug，超过容器部分显示省略号
+## 1.0.6（2023-04-12）
+- 修复 微信小程序点击时会改变背景颜色的 bug
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -0,0 +1,562 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{textShow}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<view v-if="current && clear && !disabled" @click.stop="clearVal">
+						<uni-icons type="clear" color="#c0c4cc" size="24" />
+					</view>
+					<view v-else>
+						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+					</view>
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" :style="getOffsetByPlacement" v-if="showSelector">
+					<view :class="placement=='bottom'?'uni-popper__arrow_bottom':'uni-popper__arrow_top'"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+							@click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @property {String} placement 弹出位置
+	 * 	@value top   		顶部弹出
+	 * 	@value bottom		底部弹出（default)
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-data-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+			placement: {
+				type: String,
+				default: 'bottom'
+			}
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
+		created() {
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom() {
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			},
+			textShow() {
+				// 长文本显示
+				let text = this.current;
+				if (text.length > 10) {
+					return text.slice(0, 25) + '...';
+				}
+				return text;
+			},
+			getOffsetByPlacement() {
+				switch (this.placement) {
+					case 'top':
+						return "bottom:calc(100% + 12px);";
+					case 'bottom':
+						return "top:calc(100% + 12px);";
+				}
+			}
+		},
+
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			},
+
+		},
+		methods: {
+			debounce(fn, time = 100) {
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query() {
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange() {
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+					if (defValue || defValue === 0) {
+						this.emit(defValue)
+					}
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					this.removeCache()
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				this.$emit('change', val)
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`, "g"), item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData() {
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey() {
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	@media (min-width: 768px) {
+		.uni-select__selector-scroll {
+			max-height: 600px;
+		}
+	}
+
+	/* #endif */
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow_bottom,
+	.uni-popper__arrow_bottom::after,
+	.uni-popper__arrow_top,
+	.uni-popper__arrow_top::after,
+	{
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 6px;
+	}
+
+	.uni-popper__arrow_bottom {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow_bottom::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-popper__arrow_top {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		bottom: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-bottom-width: 0;
+		border-top-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow_top::after {
+		content: " ";
+		bottom: 1px;
+		margin-left: -6px;
+		border-bottom-width: 0;
+		border-top-color: #fff;
+	}
+
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		z-index: 2;
+	}
+</style>

uni_modules/uni-data-select/package.json

@@ -0,0 +1,86 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "1.0.8",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-data-select/readme.md

@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-load-more/changelog.md

@@ -0,0 +1,19 @@
+## 1.3.3（2022-01-20）
+- 新增 showText属性 ，是否显示文本
+## 1.3.2（2022-01-19）
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1（2022-01-19）
+- 修复 微信小程序平台样式选择器报警告的问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+## 1.2.1（2021-08-24）
+- 新增 支持国际化
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-05-12）
+- 新增 组件示例地址
+## 1.1.7（2021-03-30）
+- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
+## 1.1.6（2021-02-05）
+- 调整为uni_modules目录规范

uni_modules/uni-load-more/components/uni-load-more/i18n/en.json

@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "Pull up to show more",
+	"uni-load-more.contentrefresh": "loading...",
+	"uni-load-more.contentnomore": "No more data"
+}

uni_modules/uni-load-more/components/uni-load-more/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json

@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉显示更多",
+	"uni-load-more.contentrefresh": "正在加载...",
+	"uni-load-more.contentnomore": "没有更多数据了"
+}

uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json

@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉顯示更多",
+	"uni-load-more.contentrefresh": "正在加載...",
+	"uni-load-more.contentnomore": "沒有更多數據了"
+}

uni_modules/uni-load-more/package.json

@@ -0,0 +1,86 @@
+{
+  "id": "uni-load-more",
+  "displayName": "uni-load-more 加载更多",
+  "version": "1.3.3",
+  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "加载更多",
+    "load-more"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-load-more/readme.md

@@ -0,0 +1,14 @@
+
+
+### LoadMore 加载更多
+> **组件名：uni-load-more**
+> 代码块： `uLoadMore`
+
+
+用于列表中，做滚动加载使用，展示 loading 的各种状态。
+
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+

unpackage/dist/build/mp-weixin/pageA/balance.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/balance"],{"038d":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={data:function(){return{}}}},"2ecb":function(e,n,t){"use strict";t.r(n);var u=t("038d"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);n["default"]=a.a},4470:function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){}));var u=function(){var e=this.$createElement;this._self._c},a=[]},7055:function(e,n,t){"use strict";t.r(n);var u=t("4470"),a=t("2ecb");for(var c in a)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(c);var r=t("828b"),i=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=i.exports},c9be:function(e,n,t){"use strict";(function(e,n){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("7055"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])}},[["c9be","common/runtime","common/vendor"]]]);
-=======
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/balance"],{"0148":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}}};n.default=u},"2a70":function(e,n,t){"use strict";t.r(n);var u=t("0148"),a=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(r);n["default"]=a.a},5536:function(e,n,t){"use strict";t.r(n);var u=t("cdee"),a=t("2a70");for(var r in a)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(r);var c,f=t("f0c5"),i=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);n["default"]=i.exports},5605:function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var a=u(t("5536"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},cdee:function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return u}));var a=function(){var e=this,n=e.$createElement;e._self._c},r=[]}},[["5605","common/runtime","common/vendor"]]]);
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/balance"],{"038d":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={data:function(){return{}}}},"2ecb":function(e,n,t){"use strict";t.r(n);var u=t("038d"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);n["default"]=a.a},4470:function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){}));var u=function(){var e=this.$createElement;this._self._c},a=[]},7055:function(e,n,t){"use strict";t.r(n);var u=t("4470"),a=t("2ecb");for(var c in a)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(c);var r=t("828b"),i=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=i.exports},c9be:function(e,n,t){"use strict";(function(e,n){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("7055"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])}},[["c9be","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageA/chat/chat.json

@@ -4,10 +4,7 @@
   "navigationStyle": "custom",
   "usingComponents": {
     "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
-<<<<<<< HEAD
-=======
     "u-icon": "/uview-ui/components/u-icon/u-icon",
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
     "kj-chat": "/components/kj-chat/kj-chat"
   }
 }

unpackage/dist/build/mp-weixin/pageA/confirm.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/confirm"],{"10a7":function(n,t,e){"use strict";e.r(t);var u=e("e9a9"),a=e("53f3");for(var c in a)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(c);e("3a5f");var f=e("828b"),i=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,"1dcbb289",null,!1,u["a"],void 0);t["default"]=i.exports},"29cd":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{toindex:function(){n.switchTab({url:"/pages/index/index"})}}};t.default=e}).call(this,e("df3c")["default"])},"3a5f":function(n,t,e){"use strict";var u=e("6f39"),a=e.n(u);a.a},"53f3":function(n,t,e){"use strict";e.r(t);var u=e("29cd"),a=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=a.a},"6f39":function(n,t,e){},e9a9:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},fdd5:function(n,t,e){"use strict";(function(n,t){var u=e("47a9");e("abeb");u(e("3240"));var a=u(e("10a7"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])}},[["fdd5","common/runtime","common/vendor"]]]);
-=======
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/confirm"],{3676:function(n,t,e){"use strict";var u=e("e381"),r=e.n(u);r.a},6491:function(n,t,e){"use strict";e.r(t);var u=e("92df"),r=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=r.a},"6e3d":function(n,t,e){"use strict";e.r(t);var u=e("84163"),r=e("6491");for(var a in r)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(a);e("3676");var c,i=e("f0c5"),f=Object(i["a"])(r["default"],u["b"],u["c"],!1,null,"1dcbb289",null,!1,u["a"],c);t["default"]=f.exports},84163:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return u}));var r=function(){var n=this,t=n.$createElement;n._self._c},a=[]},"8a38":function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var r=u(e("6e3d"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(r.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"92df":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{toindex:function(){n.switchTab({url:"/pages/index/index"})}}};t.default=e}).call(this,e("543d")["default"])},e381:function(n,t,e){}},[["8a38","common/runtime","common/vendor"]]]);
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/confirm"],{"10a7":function(n,t,e){"use strict";e.r(t);var u=e("e9a9"),a=e("53f3");for(var c in a)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(c);e("3a5f");var f=e("828b"),i=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,"1dcbb289",null,!1,u["a"],void 0);t["default"]=i.exports},"29cd":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{toindex:function(){n.switchTab({url:"/pages/index/index"})}}};t.default=e}).call(this,e("df3c")["default"])},"3a5f":function(n,t,e){"use strict";var u=e("6f39"),a=e.n(u);a.a},"53f3":function(n,t,e){"use strict";e.r(t);var u=e("29cd"),a=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=a.a},"6f39":function(n,t,e){},e9a9:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},fdd5:function(n,t,e){"use strict";(function(n,t){var u=e("47a9");e("abeb");u(e("3240"));var a=u(e("10a7"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])}},[["fdd5","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageA/index.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/index"],{"9c25":function(e,t,n){},"9f3f":function(e,t,n){"use strict";n.r(t);var a=n("f6eb"),r=n("e35d");for(var c in r)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(c);n("a165");var o=n("828b"),u=Object(o["a"])(r["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],void 0);t["default"]=u.exports},a165:function(e,t,n){"use strict";var a=n("9c25"),r=n.n(a);r.a},a412:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={data:function(){return{code:"",characters:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}},methods:{generateRandomCode:function(){for(var e="",t=0;t<4;t++){var n=Math.floor(Math.random()*this.characters.length);e+=this.characters[n]}this.code=e,console.log(this.code)},generateCode:function(){this.generateRandomCode()}},mounted:function(){this.generateCode()}};t.default=a},ca23:function(e,t,n){"use strict";(function(e,t){var a=n("47a9");n("abeb");a(n("3240"));var r=a(n("9f3f"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(r.default)}).call(this,n("3223")["default"],n("df3c")["createPage"])},e35d:function(e,t,n){"use strict";n.r(t);var a=n("a412"),r=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(c);t["default"]=r.a},f6eb:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return r})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},r=[]}},[["ca23","common/runtime","common/vendor"]]]);
-=======
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/index"],{"0387":function(e,t,n){"use strict";var a=n("b61b"),r=n.n(a);r.a},"73d5":function(e,t,n){"use strict";var a;n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){return a}));var r=function(){var e=this,t=e.$createElement;e._self._c},c=[]},b00b:function(e,t,n){"use strict";n.r(t);var a=n("73d5"),r=n("e3c0");for(var c in r)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(c);n("0387");var o,u=n("f0c5"),i=Object(u["a"])(r["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],o);t["default"]=i.exports},b61b:function(e,t,n){},cde8:function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("f93b");a(n("66fd"));var r=a(n("b00b"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(r.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},e3c0:function(e,t,n){"use strict";n.r(t);var a=n("f05a"),r=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(c);t["default"]=r.a},f05a:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={data:function(){return{code:"",characters:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}},methods:{generateRandomCode:function(){for(var e="",t=0;t<4;t++){var n=Math.floor(Math.random()*this.characters.length);e+=this.characters[n]}this.code=e,console.log(this.code)},generateCode:function(){this.generateRandomCode()}},mounted:function(){this.generateCode()}};t.default=a}},[["cde8","common/runtime","common/vendor"]]]);
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/index"],{"9c25":function(e,t,n){},"9f3f":function(e,t,n){"use strict";n.r(t);var a=n("f6eb"),r=n("e35d");for(var c in r)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(c);n("a165");var o=n("828b"),u=Object(o["a"])(r["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],void 0);t["default"]=u.exports},a165:function(e,t,n){"use strict";var a=n("9c25"),r=n.n(a);r.a},a412:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={data:function(){return{code:"",characters:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}},methods:{generateRandomCode:function(){for(var e="",t=0;t<4;t++){var n=Math.floor(Math.random()*this.characters.length);e+=this.characters[n]}this.code=e,console.log(this.code)},generateCode:function(){this.generateRandomCode()}},mounted:function(){this.generateCode()}};t.default=a},ca23:function(e,t,n){"use strict";(function(e,t){var a=n("47a9");n("abeb");a(n("3240"));var r=a(n("9f3f"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(r.default)}).call(this,n("3223")["default"],n("df3c")["createPage"])},e35d:function(e,t,n){"use strict";n.r(t);var a=n("a412"),r=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(c);t["default"]=r.a},f6eb:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return r})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},r=[]}},[["ca23","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageA/logisticsinfo.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/logisticsinfo"],{"1caf":function(n,t,e){"use strict";e.r(t);var u=e("82e8"),a=e("a786");for(var c in a)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(c);e("395b");var i=e("828b"),r=Object(i["a"])(a["default"],u["b"],u["c"],!1,null,"32c639ad",null,!1,u["a"],void 0);t["default"]=r.exports},"2d4e":function(n,t,e){"use strict";(function(n,t){var u=e("47a9");e("abeb");u(e("3240"));var a=u(e("1caf"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},"395b":function(n,t,e){"use strict";var u=e("4102"),a=e.n(u);a.a},4102:function(n,t,e){},6402:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}}}},"82e8":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},a786:function(n,t,e){"use strict";e.r(t);var u=e("6402"),a=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=a.a}},[["2d4e","common/runtime","common/vendor"]]]);
-=======
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/logisticsinfo"],{"719e":function(n,e,t){},"78c0":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}}};e.default=u},"8e97":function(n,e,t){"use strict";var u;t.d(e,"b",(function(){return c})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var c=function(){var n=this,e=n.$createElement;n._self._c},r=[]},"966d":function(n,e,t){"use strict";var u=t("719e"),c=t.n(u);c.a},"9b6f":function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("f93b");u(t("66fd"));var c=u(t("9e2e"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(c.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"9e2e":function(n,e,t){"use strict";t.r(e);var u=t("8e97"),c=t("c7a3");for(var r in c)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(r);t("966d");var a,i=t("f0c5"),f=Object(i["a"])(c["default"],u["b"],u["c"],!1,null,"32c639ad",null,!1,u["a"],a);e["default"]=f.exports},c7a3:function(n,e,t){"use strict";t.r(e);var u=t("78c0"),c=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=c.a}},[["9b6f","common/runtime","common/vendor"]]]);
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/logisticsinfo"],{"1caf":function(n,t,e){"use strict";e.r(t);var u=e("82e8"),a=e("a786");for(var c in a)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(c);e("395b");var i=e("828b"),r=Object(i["a"])(a["default"],u["b"],u["c"],!1,null,"32c639ad",null,!1,u["a"],void 0);t["default"]=r.exports},"2d4e":function(n,t,e){"use strict";(function(n,t){var u=e("47a9");e("abeb");u(e("3240"));var a=u(e("1caf"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},"395b":function(n,t,e){"use strict";var u=e("4102"),a=e.n(u);a.a},4102:function(n,t,e){},6402:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}}}},"82e8":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},a786:function(n,t,e){"use strict";e.r(t);var u=e("6402"),a=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=a.a}},[["2d4e","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageA/payorder.wxss

@@ -1,5 +1 @@
-<<<<<<< HEAD
-.payment.data-v-bfe9016c{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-bfe9016c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-bfe9016c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-bfe9016c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-bfe9016c{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-bfe9016c{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-bfe9016c{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-bfe9016c{position:relative}.back .topbox .state.data-v-bfe9016c{width:128rpx;background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-bfe9016c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-bfe9016c{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
-=======
-.payment.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-212d0d0a{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-212d0d0a{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-212d0d0a{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-212d0d0a{position:relative}.back .topbox .state.data-v-212d0d0a{width:128rpx;background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-212d0d0a{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
+.payment.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-212d0d0a{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-212d0d0a{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-212d0d0a{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-212d0d0a{position:relative}.back .topbox .state.data-v-212d0d0a{width:128rpx;background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-212d0d0a{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}

unpackage/dist/build/mp-weixin/pageA/service/service.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/service/service"],{1750:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},methods:{retu:function(){n.navigateBack()}}};e.default=t}).call(this,t("df3c")["default"])},"2ad7":function(n,e,t){},"3b72":function(n,e,t){"use strict";t.r(e);var u=t("6fdd"),a=t("cc53");for(var c in a)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(c);t("9473");var r=t("828b"),i=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);e["default"]=i.exports},"6fdd":function(n,e,t){"use strict";t.d(e,"b",(function(){return a})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return u}));var u={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"f3ae"))},uIcon:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-icon/u-icon")]).then(t.bind(null,"b73a"))}},a=function(){var n=this.$createElement;this._self._c},c=[]},9473:function(n,e,t){"use strict";var u=t("2ad7"),a=t.n(u);a.a},"99ba":function(n,e,t){"use strict";(function(n,e){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("3b72"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},cc53:function(n,e,t){"use strict";t.r(e);var u=t("1750"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);e["default"]=a.a}},[["99ba","common/runtime","common/vendor"]]]);
-=======
-require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/service/service"],{"277f":function(n,e,t){"use strict";t.r(e);var u=t("3fe9"),c=t("c5ad");for(var a in c)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(a);t("c8a7");var r,o=t("f0c5"),i=Object(o["a"])(c["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],r);e["default"]=i.exports},"2bce":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},methods:{retu:function(){n.navigateBack()}}};e.default=t}).call(this,t("543d")["default"])},"3fe9":function(n,e,t){"use strict";t.d(e,"b",(function(){return c})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return u}));var u={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"b6bd"))},uIcon:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-icon/u-icon")]).then(t.bind(null,"01eb"))}},c=function(){var n=this,e=n.$createElement;n._self._c},a=[]},ad23:function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("f93b");u(t("66fd"));var c=u(t("277f"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(c.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},c5ad:function(n,e,t){"use strict";t.r(e);var u=t("2bce"),c=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);e["default"]=c.a},c8a7:function(n,e,t){"use strict";var u=t("df3c"),c=t.n(u);c.a},df3c:function(n,e,t){}},[["ad23","common/runtime","common/vendor"]]]);
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
+require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/service/service"],{1750:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},methods:{retu:function(){n.navigateBack()}}};e.default=t}).call(this,t("df3c")["default"])},"2ad7":function(n,e,t){},"3b72":function(n,e,t){"use strict";t.r(e);var u=t("6fdd"),a=t("cc53");for(var c in a)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(c);t("9473");var r=t("828b"),i=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);e["default"]=i.exports},"6fdd":function(n,e,t){"use strict";t.d(e,"b",(function(){return a})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return u}));var u={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"f3ae"))},uIcon:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-icon/u-icon")]).then(t.bind(null,"b73a"))}},a=function(){var n=this.$createElement;this._self._c},c=[]},9473:function(n,e,t){"use strict";var u=t("2ad7"),a=t.n(u);a.a},"99ba":function(n,e,t){"use strict";(function(n,e){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("3b72"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},cc53:function(n,e,t){"use strict";t.r(e);var u=t("1750"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);e["default"]=a.a}},[["99ba","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageA/shoplist.wxss

@@ -1,5 +1 @@
-<<<<<<< HEAD
-.box.data-v-5977cee4{width:750rpx;min-height:1360rpx;background:#fff;border-radius:28rpx 28rpx 0rpx 0rpx;padding:38rpx 20rpx 20rpx;box-sizing:border-box;margin-top:20rpx}.pop.data-v-5977cee4{width:750rpx;background:#fff;padding:36rpx 32rpx;box-sizing:border-box}.pop .btn1.data-v-5977cee4{width:702rpx;height:84rpx;background:rgba(248,50,36,.1);border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#f83224;line-height:84rpx;text-align:center;font-style:normal;border-radius:42rpx 0 0 42rpx}.pop .btn2.data-v-5977cee4{width:702rpx;height:84rpx;background:#f83224;border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal;border-radius:0rpx 42rpx 42rpx 0}.pop .item.data-v-5977cee4{width:206rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#131415;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx}.pop .acitem.data-v-5977cee4{width:206rpx;height:64rpx;font-family:PingFangSC,PingFang SC;font-weight:400;border-radius:36rpx;font-size:24rpx;color:#f83224;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx;background:rgba(248,50,36,.1);border:1rpx solid #f83224;box-sizing:border-box}.pop .title.data-v-5977cee4{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:26rpx;color:#131415;line-height:36rpx;text-align:left;font-style:normal;margin-bottom:24rpx}.pop .input.data-v-5977cee4{width:312rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx}
-=======
-.box.data-v-1141e5a4{width:750rpx;min-height:1360rpx;background:#fff;border-radius:28rpx 28rpx 0rpx 0rpx;padding:38rpx 20rpx 20rpx;box-sizing:border-box;margin-top:20rpx}.pop.data-v-1141e5a4{width:750rpx;background:#fff;padding:36rpx 32rpx;box-sizing:border-box}.pop .btn1.data-v-1141e5a4{width:702rpx;height:84rpx;background:rgba(248,50,36,.1);border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#f83224;line-height:84rpx;text-align:center;font-style:normal;border-radius:42rpx 0 0 42rpx}.pop .btn2.data-v-1141e5a4{width:702rpx;height:84rpx;background:#f83224;border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal;border-radius:0rpx 42rpx 42rpx 0}.pop .item.data-v-1141e5a4{width:206rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#131415;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx}.pop .acitem.data-v-1141e5a4{width:206rpx;height:64rpx;font-family:PingFangSC,PingFang SC;font-weight:400;border-radius:36rpx;font-size:24rpx;color:#f83224;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx;background:rgba(248,50,36,.1);border:1rpx solid #f83224;box-sizing:border-box}.pop .title.data-v-1141e5a4{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:26rpx;color:#131415;line-height:36rpx;text-align:left;font-style:normal;margin-bottom:24rpx}.pop .input.data-v-1141e5a4{width:312rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx}
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
+.box.data-v-1141e5a4{width:750rpx;min-height:1360rpx;background:#fff;border-radius:28rpx 28rpx 0rpx 0rpx;padding:38rpx 20rpx 20rpx;box-sizing:border-box;margin-top:20rpx}.pop.data-v-1141e5a4{width:750rpx;background:#fff;padding:36rpx 32rpx;box-sizing:border-box}.pop .btn1.data-v-1141e5a4{width:702rpx;height:84rpx;background:rgba(248,50,36,.1);border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#f83224;line-height:84rpx;text-align:center;font-style:normal;border-radius:42rpx 0 0 42rpx}.pop .btn2.data-v-1141e5a4{width:702rpx;height:84rpx;background:#f83224;border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal;border-radius:0rpx 42rpx 42rpx 0}.pop .item.data-v-1141e5a4{width:206rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#131415;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx}.pop .acitem.data-v-1141e5a4{width:206rpx;height:64rpx;font-family:PingFangSC,PingFang SC;font-weight:400;border-radius:36rpx;font-size:24rpx;color:#f83224;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx;background:rgba(248,50,36,.1);border:1rpx solid #f83224;box-sizing:border-box}.pop .title.data-v-1141e5a4{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:26rpx;color:#131415;line-height:36rpx;text-align:left;font-style:normal;margin-bottom:24rpx}.pop .input.data-v-1141e5a4{width:312rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx}

unpackage/dist/build/mp-weixin/pageB/orderinfo.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"0b4e":function(n,e,t){},"25fa":function(n,e,t){"use strict";t.r(e);var o=t("d0ec"),r=t("a9d5");for(var a in r)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(a);t("c445");var c=t("828b"),u=Object(c["a"])(r["default"],o["b"],o["c"],!1,null,"685c0a95",null,!1,o["a"],void 0);e["default"]=u.exports},"8b5a":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo)},computed:{i18n:function(){return this.$t("index")}}};e.default=o},"8d8c":function(n,e,t){"use strict";(function(n,e){var o=t("47a9");t("abeb");o(t("3240"));var r=o(t("25fa"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(r.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},a9d5:function(n,e,t){"use strict";t.r(e);var o=t("8b5a"),r=t.n(o);for(var a in o)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(a);e["default"]=r.a},c445:function(n,e,t){"use strict";var o=t("0b4e"),r=t.n(o);r.a},d0ec:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){}));var o=function(){var n=this.$createElement;this._self._c},r=[]}},[["8d8c","common/runtime","common/vendor"]]]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"0de3":function(n,e,t){},"35a1":function(n,e,t){"use strict";(function(n,e){var r=t("4ea4");t("f93b");r(t("66fd"));var o=r(t("8079"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"68ad":function(n,e,t){"use strict";var r=t("0de3"),o=t.n(r);o.a},8079:function(n,e,t){"use strict";t.r(e);var r=t("886a"),o=t("ff47");for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t("68ad");var a,f=t("f0c5"),i=Object(f["a"])(o["default"],r["b"],r["c"],!1,null,"29418134",null,!1,r["a"],a);e["default"]=i.exports},"886a":function(n,e,t){"use strict";var r;t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return r}));var o=function(){var n=this,e=n.$createElement;n._self._c},u=[]},"9e74":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo)},computed:{i18n:function(){return this.$t("index")}}};e.default=r},ff47:function(n,e,t){"use strict";t.r(e);var r=t("9e74"),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a}},[["35a1","common/runtime","common/vendor"]]]);
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"0f76":function(n,t,e){},"25fa":function(n,t,e){"use strict";e.r(t);var o=e("8e93"),r=e("a9d5");for(var a in r)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(a);e("c038");var u=e("828b"),i=Object(u["a"])(r["default"],o["b"],o["c"],!1,null,"29418134",null,!1,o["a"],void 0);t["default"]=i.exports},"8b5a":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo)},computed:{i18n:function(){return this.$t("index")}}};t.default=o},"8d8c":function(n,t,e){"use strict";(function(n,t){var o=e("47a9");e("abeb");o(e("3240"));var r=o(e("25fa"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(r.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},"8e93":function(n,t,e){"use strict";e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){}));var o=function(){var n=this.$createElement;this._self._c},r=[]},a9d5:function(n,t,e){"use strict";e.r(t);var o=e("8b5a"),r=e.n(o);for(var a in o)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(a);t["default"]=r.a},c038:function(n,t,e){"use strict";var o=e("0f76"),r=e.n(o);r.a}},[["8d8c","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/accountSetup/accountSetup.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"48ae":function(t,n,e){"use strict";var i=e("d515"),u=e.n(i);u.a},"8edf":function(t,n,e){"use strict";e.r(n);var i=e("f57d"),u=e("9825");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("48ae");var o=e("828b"),c=Object(o["a"])(u["default"],i["b"],i["c"],!1,null,"d50eb15e",null,!1,i["a"],void 0);n["default"]=c.exports},9443:function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var u=i(e("8edf"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},9825:function(t,n,e){"use strict";e.r(n);var i=e("d786"),u=e.n(i);for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);n["default"]=u.a},d515:function(t,n,e){},d786:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={components:{AllRight:function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("2c60"))}.bind(null,e)).catch(e.oe)}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"})},toNextPage:function(n){t.navigateTo({url:n})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=i}).call(this,e("df3c")["default"])},f57d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},u=[]}},[["9443","common/runtime","common/vendor"]]]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{2059:function(t,n,e){},"58a5":function(t,n,e){"use strict";e.r(n);var a=e("e7dd"),u=e.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);n["default"]=u.a},"61c5":function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return a}));var u=function(){var t=this,n=t.$createElement;t._self._c},i=[]},"67dc":function(t,n,e){"use strict";e.r(n);var a=e("61c5"),u=e("58a5");for(var i in u)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(i);e("ea63");var o,c=e("f0c5"),r=Object(c["a"])(u["default"],a["b"],a["c"],!1,null,"d50eb15e",null,!1,a["a"],o);n["default"]=r.exports},"9e36":function(t,n,e){"use strict";(function(t,n){var a=e("4ea4");e("f93b");a(e("66fd"));var u=a(e("67dc"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},e7dd:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("edae"))}.bind(null,e)).catch(e.oe)},u={components:{AllRight:a},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"})},toNextPage:function(n){t.navigateTo({url:n})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=u}).call(this,e("543d")["default"])},ea63:function(t,n,e){"use strict";var a=e("2059"),u=e.n(a);u.a}},[["9e36","common/runtime","common/vendor"]]]);
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"48ae":function(t,n,e){"use strict";var i=e("d515"),u=e.n(i);u.a},"8edf":function(t,n,e){"use strict";e.r(n);var i=e("f57d"),u=e("9825");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("48ae");var o=e("828b"),c=Object(o["a"])(u["default"],i["b"],i["c"],!1,null,"d50eb15e",null,!1,i["a"],void 0);n["default"]=c.exports},9443:function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var u=i(e("8edf"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},9825:function(t,n,e){"use strict";e.r(n);var i=e("d786"),u=e.n(i);for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);n["default"]=u.a},d515:function(t,n,e){},d786:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={components:{AllRight:function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("2c60"))}.bind(null,e)).catch(e.oe)}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"})},toNextPage:function(n){t.navigateTo({url:n})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=i}).call(this,e("df3c")["default"])},f57d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},u=[]}},[["9443","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/myPackage/component/packageCard"],{"15cb":function(t,e,n){"use strict";n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){}));var i=function(){var t=this.$createElement,e=(this._self._c,"unpaid"==this.itemInfo.status?this.itemInfo.actual_price.split("."):null),n="unpaid"==this.itemInfo.status?this.itemInfo.actual_price.split("."):null,i=Number(this.itemInfo.actual_weight);this.$mp.data=Object.assign({},{$root:{g0:e,g1:n,m0:i}})},o=[]},4908:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={props:{itemInfo:{typeof:Object,default:{}}},computed:{orderDetail:function(){return 0==this.itemInfo.orderStatus?"待平台收货":1==this.itemInfo.orderStatus?"待付款":2==this.itemInfo.orderStatus?"待发货":3==this.itemInfo.orderStatus?"拼包中":4==this.itemInfo.orderStatus?"待寄件":void 0}},data:function(){return{}},methods:{freeze:function(){var e=this;t.$u.http.post("/api/express-order/froze/".concat(this.itemInfo.id)).then((function(n){t.showToast({title:0==e.itemInfo.is_frozen?"已冻结":"已恢复",icon:"none"})}))},toPayment:function(){t.navigateTo({url:"/pageD/paymentOrder/paymentOrder"})},toSending:function(){t.navigateTo({url:"/pageD/sending/sending?orderId="+this.itemInfo.id})}}};e.default=n}).call(this,n("df3c")["default"])},"4c4f":function(t,e,n){"use strict";var i=n("60c4"),o=n.n(i);o.a},"52cd":function(t,e,n){"use strict";n.r(e);var i=n("15cb"),o=n("58e9");for(var a in o)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(a);n("4c4f");var r=n("828b"),u=Object(r["a"])(o["default"],i["b"],i["c"],!1,null,"1306fc70",null,!1,i["a"],void 0);e["default"]=u.exports},"58e9":function(t,e,n){"use strict";n.r(e);var i=n("4908"),o=n.n(i);for(var a in i)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(a);e["default"]=o.a},"60c4":function(t,e,n){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/myPackage/component/packageCard"],{"0983":function(t,e,n){"use strict";n.r(e);var a=n("93b3"),i=n.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(o);e["default"]=i.a},"63e4":function(t,e,n){"use strict";n.r(e);var a=n("d4a4"),i=n("0983");for(var o in i)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(o);n("e42a");var r,u=n("f0c5"),f=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"ff60fc78",null,!1,a["a"],r);e["default"]=f.exports},"93b3":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={props:{itemInfo:{typeof:Object,default:{}}},computed:{orderDetail:function(){return 0==this.itemInfo.orderStatus?"待平台收货":1==this.itemInfo.orderStatus?"待付款":2==this.itemInfo.orderStatus?"待发货":3==this.itemInfo.orderStatus?"拼包中":4==this.itemInfo.orderStatus?"待寄件":void 0}},data:function(){return{}},methods:{freeze:function(){var e=this;t.$u.http.post("/api/express-order/froze/".concat(this.itemInfo.id)).then((function(n){t.showToast({title:0==e.itemInfo.is_frozen?"已冻结":"已恢复",icon:"none"})}))},toPayment:function(){t.navigateTo({url:"/pageD/paymentOrder/paymentOrder"})},toSending:function(){t.navigateTo({url:"/pageD/sending/sending"})}}};e.default=n}).call(this,n("543d")["default"])},be28:function(t,e,n){},d4a4:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return a}));var i=function(){var t=this,e=t.$createElement,n=(t._self._c,"unpaid"==t.itemInfo.status?t.itemInfo.actual_price.split("."):null),a="unpaid"==t.itemInfo.status?t.itemInfo.actual_price.split("."):null,i=Number(t.itemInfo.actual_weight);t.$mp.data=Object.assign({},{$root:{g0:n,g1:a,m0:i}})},o=[]},e42a:function(t,e,n){"use strict";var a=n("be28"),i=n.n(a);i.a}}]);
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/myPackage/component/packageCard-create-component',
     {

unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.wxml

@@ -1,5 +1 @@
-<<<<<<< HEAD
-<view class="data-v-571359f7"><view class="top-search data-v-571359f7"><u--input bind:input="__e" vue-id="ac2da40c-1" placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" class="data-v-571359f7" bind:__l="__l"></u--input><view class="top-tab data-v-571359f7"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-571359f7',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{'发往中转点'+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-571359f7',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{'中转已签收 '+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-571359f7',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{'正发往海外 '+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-571359f7',(follow=='other')?'commodity':'']}}" bindtap="__e">{{'其他 '+statusNum.other+''}}</view></view></view><view class="content data-v-571359f7"><view class="prompt data-v-571359f7"><image class="prompt-icon data-v-571359f7" src="../../static/mine/336.png" mode></image>当前页面加载的订单总重量300kg</view><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-571359f7"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-571359f7" bind:__l="__l"></package-card></view></block></view></view>
-=======
-<view class="data-v-4cb10bb6"><view class="top-search data-v-4cb10bb6"><u--input bind:input="__e" vue-id="ac2da40c-1" placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" class="data-v-4cb10bb6" bind:__l="__l"></u--input><view class="top-tab data-v-4cb10bb6"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-4cb10bb6',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{'发往中转点'+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-4cb10bb6',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{'中转已签收 '+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-4cb10bb6',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{'正发往海外 '+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-4cb10bb6',(follow=='other')?'commodity':'']}}" bindtap="__e">{{'其他 '+statusNum.other+''}}</view></view></view><view class="content data-v-4cb10bb6"><block wx:if="{{weights>=300}}"><view class="prompt data-v-4cb10bb6"><image class="prompt-icon data-v-4cb10bb6" src="../../static/mine/336.png" mode></image>当前页面加载的订单总重量300kg</view></block><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-4cb10bb6"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-4cb10bb6" bind:__l="__l"></package-card></view></block></view></view>
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
+<view class="data-v-51ce92c5"><view class="top-search data-v-51ce92c5"><u--input bind:input="__e" vue-id="ac2da40c-1" placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" class="data-v-51ce92c5" bind:__l="__l"></u--input><view class="top-tab data-v-51ce92c5"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-51ce92c5',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{'发往中转点'+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-51ce92c5',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{'中转已签收 '+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-51ce92c5',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{'正发往海外 '+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-51ce92c5',(follow=='other')?'commodity':'']}}" bindtap="__e">{{'其他 '+statusNum.other+''}}</view></view></view><view class="content data-v-51ce92c5"><view class="prompt data-v-51ce92c5"><image class="prompt-icon data-v-51ce92c5" src="../../static/mine/336.png" mode></image>{{'当前页面加载的订单总重量'+weights+'kg'}}</view><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-51ce92c5"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-51ce92c5" bind:__l="__l"></package-card></view></block></view></view>

unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.wxss

@@ -1,5 +1 @@
-<<<<<<< HEAD
-.top-search.data-v-571359f7{background-color:#fff;padding:20rpx 24rpx}.data-v-571359f7 .u-input{background-color:#f4f4f4}.top-tab.data-v-571359f7{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-571359f7{margin-right:40rpx;font-size:26rpx;color:#555;flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;font-size:32rpx}.top-tab .commodity.data-v-571359f7{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-571359f7::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-571359f7{padding:20rpx 24rpx}.content .prompt.data-v-571359f7{background-color:#fbe8e6;border-radius:10rpx;padding:16rpx 22rpx;font-size:24rpx;display:flex;align-items:center;color:#f83224}.content .prompt .prompt-icon.data-v-571359f7{width:36rpx;height:36rpx;margin-right:20rpx}
-=======
-.top-search.data-v-4cb10bb6{background-color:#fff;padding:20rpx 24rpx}.data-v-4cb10bb6 .u-input{background-color:#f4f4f4}.top-tab.data-v-4cb10bb6{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-4cb10bb6{margin-right:40rpx;font-size:26rpx;color:#555;flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;font-size:32rpx}.top-tab .commodity.data-v-4cb10bb6{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-4cb10bb6::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-4cb10bb6{padding:20rpx 24rpx}.content .prompt.data-v-4cb10bb6{background-color:#fbe8e6;border-radius:10rpx;padding:16rpx 22rpx;font-size:24rpx;display:flex;align-items:center;color:#f83224}.content .prompt .prompt-icon.data-v-4cb10bb6{width:36rpx;height:36rpx;margin-right:20rpx}
->>>>>>> 48dee21b5839a45f8e6d01cf23796c0e7d68cf3d
+.top-search.data-v-51ce92c5{background-color:#fff;padding:20rpx 24rpx}.data-v-51ce92c5 .u-input{background-color:#f4f4f4}.top-tab.data-v-51ce92c5{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-51ce92c5{margin-right:40rpx;font-size:26rpx;color:#555;flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;font-size:32rpx}.top-tab .commodity.data-v-51ce92c5{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-51ce92c5::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-51ce92c5{padding:20rpx 24rpx}.content .prompt.data-v-51ce92c5{background-color:#fbe8e6;border-radius:10rpx;padding:16rpx 22rpx;font-size:24rpx;display:flex;align-items:center;color:#f83224}.content .prompt .prompt-icon.data-v-51ce92c5{width:36rpx;height:36rpx;margin-right:20rpx}

unpackage/dist/build/mp-weixin/pages/mine/component/mallOrderForm.json

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

unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json

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

unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uni_modules/uni-icons/components/uni-icons/uni-icons"],{"0932":function(t,n,i){"use strict";var e=i("d13a"),o=i.n(e);o.a},3790:function(t,n,i){"use strict";i.r(n);var e=i("5741"),o=i.n(e);for(var c in e)["default"].indexOf(c)<0&&function(t){i.d(n,t,(function(){return e[t]}))}(c);n["default"]=o.a},"3be8":function(t,n,i){"use strict";i.r(n);var e=i("3d84b"),o=i("3790");for(var c in o)["default"].indexOf(c)<0&&function(t){i.d(n,t,(function(){return o[t]}))}(c);i("0932");var u=i("828b"),r=Object(u["a"])(o["default"],e["b"],e["c"],!1,null,null,null,!1,e["a"],void 0);n["default"]=r.exports},"3d84b":function(t,n,i){"use strict";i.d(n,"b",(function(){return e})),i.d(n,"c",(function(){return o})),i.d(n,"a",(function(){}));var e=function(){var t=this.$createElement;this._self._c},o=[]},5741:function(t,n,i){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e=i("bdb3"),o={name:"UniIcons",emits:["click"],props:{type:{type:String,default:""},color:{type:String,default:"#333333"},size:{type:[Number,String],default:16},customPrefix:{type:String,default:""},fontFamily:{type:String,default:""}},data:function(){return{icons:e.fontData}},computed:{unicode:function(){var t=this,n=this.icons.find((function(n){return n.font_class===t.type}));return n?n.unicode:""},iconSize:function(){return function(t){return"number"===typeof t||/^[0-9]*$/g.test(t)?t+"px":t}(this.size)},styleObj:function(){return""!==this.fontFamily?"color: ".concat(this.color,"; font-size: ").concat(this.iconSize,"; font-family: ").concat(this.fontFamily,";"):"color: ".concat(this.color,"; font-size: ").concat(this.iconSize,";")}},methods:{_onClick:function(){this.$emit("click")}}};n.default=o},d13a:function(t,n,i){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uni_modules/uni-icons/components/uni-icons/uni-icons"],{"0932":function(t,n,i){"use strict";var e=i("d13a"),o=i.n(e);o.a},3790:function(t,n,i){"use strict";i.r(n);var e=i("5741"),o=i.n(e);for(var c in e)["default"].indexOf(c)<0&&function(t){i.d(n,t,(function(){return e[t]}))}(c);n["default"]=o.a},"3be8":function(t,n,i){"use strict";i.r(n);var e=i("3d84"),o=i("3790");for(var c in o)["default"].indexOf(c)<0&&function(t){i.d(n,t,(function(){return o[t]}))}(c);i("0932");var u=i("828b"),r=Object(u["a"])(o["default"],e["b"],e["c"],!1,null,null,null,!1,e["a"],void 0);n["default"]=r.exports},"3d84":function(t,n,i){"use strict";i.d(n,"b",(function(){return e})),i.d(n,"c",(function(){return o})),i.d(n,"a",(function(){}));var e=function(){var t=this.$createElement;this._self._c},o=[]},5741:function(t,n,i){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e=i("bdb3"),o={name:"UniIcons",emits:["click"],props:{type:{type:String,default:""},color:{type:String,default:"#333333"},size:{type:[Number,String],default:16},customPrefix:{type:String,default:""},fontFamily:{type:String,default:""}},data:function(){return{icons:e.fontData}},computed:{unicode:function(){var t=this,n=this.icons.find((function(n){return n.font_class===t.type}));return n?n.unicode:""},iconSize:function(){return function(t){return"number"===typeof t||/^[0-9]*$/g.test(t)?t+"px":t}(this.size)},styleObj:function(){return""!==this.fontFamily?"color: ".concat(this.color,"; font-size: ").concat(this.iconSize,"; font-family: ").concat(this.fontFamily,";"):"color: ".concat(this.color,"; font-size: ").concat(this.iconSize,";")}},methods:{_onClick:function(){this.$emit("click")}}};n.default=o},d13a:function(t,n,i){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'uni_modules/uni-icons/components/uni-icons/uni-icons-create-component',
     {

unpackage/dist/build/mp-weixin/uview-ui/components/u-line/u-line.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u-line/u-line"],{"21be5":function(t,e,i){"use strict";i.d(e,"b",(function(){return n})),i.d(e,"c",(function(){return r})),i.d(e,"a",(function(){}));var n=function(){var t=this.$createElement,e=(this._self._c,this.__get_style([this.lineStyle]));this.$mp.data=Object.assign({},{$root:{s0:e}})},r=[]},9497:function(t,e,i){"use strict";i.r(e);var n=i("c083"),r=i.n(n);for(var a in n)["default"].indexOf(a)<0&&function(t){i.d(e,t,(function(){return n[t]}))}(a);e["default"]=r.a},c083:function(t,e,i){"use strict";(function(t){var n=i("47a9");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=n(i("f838")),a={name:"u-line",mixins:[t.$u.mpMixin,t.$u.mixin,r.default],computed:{lineStyle:function(){var e={};return e.margin=this.margin,"row"===this.direction?(e.borderBottomWidth="1px",e.borderBottomStyle=this.dashed?"dashed":"solid",e.width=t.$u.addUnit(this.length),this.hairline&&(e.transform="scaleY(0.5)")):(e.borderLeftWidth="1px",e.borderLeftStyle=this.dashed?"dashed":"solid",e.height=t.$u.addUnit(this.length),this.hairline&&(e.transform="scaleX(0.5)")),e.borderColor=this.color,t.$u.deepMerge(e,t.$u.addStyle(this.customStyle))}}};e.default=a}).call(this,i("df3c")["default"])},eaec:function(t,e,i){},f002:function(t,e,i){"use strict";var n=i("eaec"),r=i.n(n);r.a},fa27:function(t,e,i){"use strict";i.r(e);var n=i("21be5"),r=i("9497");for(var a in r)["default"].indexOf(a)<0&&function(t){i.d(e,t,(function(){return r[t]}))}(a);i("f002");var u=i("828b"),o=Object(u["a"])(r["default"],n["b"],n["c"],!1,null,"76752b88",null,!1,n["a"],void 0);e["default"]=o.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u-line/u-line"],{"21be":function(t,e,i){"use strict";i.d(e,"b",(function(){return n})),i.d(e,"c",(function(){return r})),i.d(e,"a",(function(){}));var n=function(){var t=this.$createElement,e=(this._self._c,this.__get_style([this.lineStyle]));this.$mp.data=Object.assign({},{$root:{s0:e}})},r=[]},9497:function(t,e,i){"use strict";i.r(e);var n=i("c083"),r=i.n(n);for(var a in n)["default"].indexOf(a)<0&&function(t){i.d(e,t,(function(){return n[t]}))}(a);e["default"]=r.a},c083:function(t,e,i){"use strict";(function(t){var n=i("47a9");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=n(i("f838")),a={name:"u-line",mixins:[t.$u.mpMixin,t.$u.mixin,r.default],computed:{lineStyle:function(){var e={};return e.margin=this.margin,"row"===this.direction?(e.borderBottomWidth="1px",e.borderBottomStyle=this.dashed?"dashed":"solid",e.width=t.$u.addUnit(this.length),this.hairline&&(e.transform="scaleY(0.5)")):(e.borderLeftWidth="1px",e.borderLeftStyle=this.dashed?"dashed":"solid",e.height=t.$u.addUnit(this.length),this.hairline&&(e.transform="scaleX(0.5)")),e.borderColor=this.color,t.$u.deepMerge(e,t.$u.addStyle(this.customStyle))}}};e.default=a}).call(this,i("df3c")["default"])},eaec:function(t,e,i){},f002:function(t,e,i){"use strict";var n=i("eaec"),r=i.n(n);r.a},fa27:function(t,e,i){"use strict";i.r(e);var n=i("21be"),r=i("9497");for(var a in r)["default"].indexOf(a)<0&&function(t){i.d(e,t,(function(){return r[t]}))}(a);i("f002");var u=i("828b"),o=Object(u["a"])(r["default"],n["b"],n["c"],!1,null,"76752b88",null,!1,n["a"],void 0);e["default"]=o.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'uview-ui/components/u-line/u-line-create-component',
     {

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

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