7.31

components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.vue

@@ -12,12 +12,12 @@
 			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation :style="[menuRight]"
 				@scroll="rightScroll">
 				<view class="menu_right_view">
-					<view class="menu_right_item" :id="'item' + index" v-for="(item , index) in tabbar" :key="index">
+	<!-- 				<view class="menu_right_item" :id="'item' + index" v-for="(item , index) in tabbar" :key="index">
 						<view class="menu_right_title">{{item[keyName]}}</view>
 						<view class="">
 							<slot :scroll_list='item[tabbarName]'></slot>
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</scroll-view>
 		</view>

pageA/payorder.vue

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

pageA/productdetails.vue

@@ -98,7 +98,14 @@
 					<view class="top u-flex u-row-between" style="margin-top: 36rpx" @click="serve = true">
 						<view class="u-flex">
 							<view class="change">{{ i18n.service }}</view>
-							<view class="" style="margin-left: 20rpx">正品保障 · 极速退款 · 7天无理由退</view>
+							<view v-if="language == 'zh-CN'" class="" style="margin-left: 20rpx">{{content.name_cn}}
+							</view>
+							<view v-if="language == 'en-US'" class="" style="margin-left: 20rpx">{{content.name_en}}
+							</view>
+							<view v-if="language == 'es-ES'" class="" style="margin-left: 20rpx">{{content.name_es}}
+							</view>
+							<view v-if="language == 'it-IT'" class="" style="margin-left: 20rpx">{{content.name_ita}}
+							</view>
 						</view>
 						<view class="">
 							<u-icon name="arrow-right" size="16"></u-icon>
@@ -337,17 +344,17 @@
 					<u-icon name="close" style="width: 22rpx; height: 22rpx"></u-icon>
 				</view>
 				<view class="contenta">
-					<view class="">
-						<view class="title">丢包丢件</view>
-						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
+					<view class="" v-if="language=='zh-CN'">
+						<u-parse :content="content.content_cn"></u-parse>
+					</view>
+					<view class="" v-if="language=='en-US'">
+						<u-parse :content="content.content_en"></u-parse>
 					</view>
-					<view class="" style="margin-top: 36rpx">
-						<view class="title">丢包丢件</view>
-						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
+					<view class="" v-if="language=='es-ES'">
+						<u-parse :content="content.content_es"></u-parse>
 					</view>
-					<view class="" style="margin-top: 36rpx">
-						<view class="title">丢包丢件</view>
-						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
+					<view class="" v-if="language=='it-IT'">
+						<u-parse :content="content.content_ita"></u-parse>
 					</view>
 				</view>
 				<view class="button" @click="serve = false">
@@ -465,6 +472,8 @@
 				commentlist: [],
 				total: "",
 				rate: 5,
+				content: {},
+				bao: ''
 			};
 		},
 		computed: {
@@ -482,6 +491,7 @@
 			}
 			this.detail(this.id);
 			this.recommend();
+			this.guarantee()
 		},
 		methods: {
 			sharea() {
@@ -584,11 +594,22 @@
 					.then((res) => {
 						console.log(res);
 						this.goodinfo = res;
+						console.log('goodinfo.discount_price',this.goodinfo.discount_price);
 						this.comment();
 						this.rate = res.merchant.score;
 					})
 					.catch(() => {});
 			},
+			//保障服务
+			guarantee() {
+				uni.$u.http
+					.get("/api/agreement?code=guarantee_service")
+					.then((res) => {
+						console.log(res);
+						this.content = res
+					})
+					.catch(() => {});
+			},
 			// scrollToPosition() {
 			// 	console.log(111);
 			// 	// 使用$refs获取目标位置的DOM元素

pageA/subsidy.vue

@@ -231,7 +231,7 @@
 					parent_id: id,
 					keyword: this.keyword
 				}).then((res) => {
-					this.list = res
+					this.list = res.data
 				}).catch(() => {
 
 				})
@@ -242,7 +242,7 @@
 					parent_id: id,
 					keyword: this.keyword
 				}).then((res) => {
-					this.list = res
+					this.list = res.data
 				}).catch(() => {
 
 				})
@@ -253,7 +253,7 @@
 					parent_id: id,
 					keyword: this.keyword
 				}).then((res) => {
-					this.list = res
+					this.list = res.data
 				}).catch(() => {
 
 				})

pageB/delivery.vue

@@ -17,9 +17,9 @@
 				<view class="left u-flex" style="display: flex;" @click="send">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/ji.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
-						<image @click.stop="changeadd" src="/static/express/change.png"
+<!-- 						<image @click.stop="changeadd" src="/static/express/change.png"
 							style='width: 40rpx;;height:40rpx ;' mode="">
-						</image>
+						</image> -->
 					</view>
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
@@ -27,7 +27,8 @@
 							<view class="pople">{{i18n.sender}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
-						<view v-else class="u-row-between " style="" @click="send">
+						<!-- <view v-else class="u-row-between " style="" @click="send"> -->
+						<view v-else class="u-row-between " style="" >
 							<view class="">
 								<text class="topname">{{topadd.name}}</text>
 								<text class="topaddress"
@@ -35,10 +36,11 @@
 							</view>
 							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
 						</view>
-						<view class="u-flex" @click.stop="addbook(0)">
+						<!-- <view class="u-flex" @click.stop="addbook(0)"> -->
+			<!-- 			<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view class="left u-flex"
@@ -54,7 +56,8 @@
 							<view class="pople">{{i18n.recipient}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
-						<view v-else class="u-row-between " style="" @click="send">
+						<!-- <view v-else class="u-row-between " style="" @click="send"> -->
+						<view v-else class="u-row-between " style="" >
 							<view class="">
 								<text class="topname">{{bottomadd.name}}</text>
 								<text class="topaddress"
@@ -62,10 +65,11 @@
 							</view>
 							<view class="topaddress" style="margin-top: 14rpx;">{{bottomadd.full_address}}</view>
 						</view>
-						<view class="u-flex" @click.stop="addbook(1)">
+						<!-- <view class="u-flex" @click.stop="addbook(1)"> -->
+			<!-- 			<view class="u-flex" >
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
-						</view>
+						</view> -->
 					</view>
 				</view>
 			</view>
@@ -82,7 +86,8 @@
 						<image src="/static/express/next1.png" style="width: 28rpx;height: 28rpx;margin-left: 6rpx;"
 							mode=""></image>
 					</view>
-					<view v-else class="goodname" @click='goods'>
+					<!-- <view v-else class="goodname" @click='goods'> -->
+					<view v-else class="goodname">
 						{{goodinfo.goodname}},{{goodinfo.weight}}kg
 					</view>
 					<!-- <view class="u-flex">
@@ -92,7 +97,8 @@
 					</view> -->
 				</view>
 				<!-- 跨境物流 -->
-				<view class="info u-flex u-row-between" @click="changewu">
+				<!-- <view class="info u-flex u-row-between" @click="changewu"> -->
+				<view class="info u-flex u-row-between" >
 					<view class="u-flex">
 						<text class="wupin">{{i18n.flow}}</text>
 					</view>
@@ -164,6 +170,7 @@
 			this.container_id = options.container_id
 			this.unit_price = options.unit_price
 			this.number = options.number
+			this.all = options.all
 		},
 		onShow() {
 			if (uni.getStorageSync('language') != '') {
@@ -176,24 +183,6 @@
 			},
 		},
 		methods: {
-			//价格计算
-			calculate() {
-				uni.$u.http.get('/api/express-order/calculate', {
-					params: {
-						container_id:this.container_id,// 是 String 货柜ID
-						weight:this.goodinfo.weight, //是 String 重量(kg)
-						length:this.goodinfo.length, //是 String 长(m)
-						width:this.goodinfo.width, //是 String 宽(m)
-						height:this.goodinfo.height, //是 String 高(m)
-						type:this.goodinfo.goodtype //是 String 商品类型: normal.普通商品,
-					}
-				}).then((res) => {
-					console.log(res);
-					this.all = res
-				}).catch(() => {
-
-				})
-			},
 			//跨境物流选择
 			success(msg) {
 				this.logshow = false
@@ -201,7 +190,6 @@
 				this.container_id = msg.dateid
 				this.rightname = msg.rightname
 				this.unit_price = msg.unit_price
-				this.calculate()
 			},
 			//改变地址
 			changeadd() {

pageB/end.vue

@@ -47,7 +47,7 @@
 				<view class="left u-flex" style="display: flex;" @click="send">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/ji.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
-						<image src="/static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
+						<!-- <image src="/static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""></image> -->
 					</view>
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
@@ -63,10 +63,10 @@
 							</view>
 							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
 						</view>
-						<view class="u-flex" @click.stop="addbook(0)">
+<!-- 						<view class="u-flex" @click.stop="addbook(0)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view class="left u-flex"
@@ -519,6 +519,7 @@
 	}
 
 	.flexc {
+		width: 300rpx;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;

pageC/myPackage/myPackage.vue

@@ -78,6 +78,10 @@ export default {
       return this.$t("index");
     },
   },
+  onLoad(options) {
+  	this.follow = options.type
+	this.getPackageList(1);
+  },
   methods: {
     tabSwitch(num) {
       this.page = 1;
@@ -120,7 +124,7 @@ export default {
     }
   },
   created() {
-    this.getPackageList(1);
+    // this.getPackageList(1);
     this.getNum();
     uni.setNavigationBarTitle({
       title: this.i18n.myPackage,

pages/express/express.vue

@@ -137,19 +137,19 @@
 					</view>
 				</view>
 				<view class="u-flex u-row-around" style="margin-top: 44rpx;">
-					<view class="flexc" style="position: relative;" @click="pack(0)">
+					<view class="flexc" style="position: relative;" @click="pack('to_transit')">
 						<!-- <view class="" style="position: absolute;top: 0;right: 0;"> -->
 						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="transit"></u-badge>
 						<!-- </view> -->
 						<image src="/static/express/address.png" style='width:68rpx;height:68rpx' mode=""></image>
 						<text style='margin-top:16rpx' class="bao">{{i18n.deliver}}</text>
 					</view>
-					<view class="flexc" style="position: relative;" @click="pack(1)">
+					<view class="flexc" style="position: relative;" @click="pack('transit_receipt')">
 						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="receipt"></u-badge>
 						<image src="/static/express/sign.png" style='width:68rpx;height:68rpx' mode=""></image>
 						<text style='margin-top:16rpx' class="bao">{{i18n.Sign}}</text>
 					</view>
-					<view class="flexc" style="position: relative;" @click="pack(2)">
+					<view class="flexc" style="position: relative;" @click="pack('to_overseas')">
 						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="overseas"></u-badge>
 						<image src="../../static/express/send.png" style='width:68rpx;height:68rpx' mode=""></image>
 						<text style='margin-top:16rpx' class="bao">{{i18n.overseas}}</text>
@@ -281,7 +281,34 @@
 			}
 		},
 		methods: {
+			//价格计算
+			calculate() {
+				uni.$u.http.get('/api/express-order/calculate', {
+					params: {
+						container_id: this.container_id, // 是 String 货柜ID
+						weight: this.goodinfo.weight, //是 String 重量(kg)
+						length: this.goodinfo.length, //是 String 长(m)
+						width: this.goodinfo.width, //是 String 宽(m)
+						height: this.goodinfo.height, //是 String 高(m)
+						type: this.goodinfo.goodtype //是 String 商品类型: normal.普通商品,
+					}
+				}).then((res) => {
+					console.log(res);
+					uni.navigateTo({
+						url: "/pageB/delivery?goodinfo=" + encodeURIComponent(JSON.stringify(this
+								.goodinfo)) +
+							"&topadd=" + encodeURIComponent(JSON.stringify(
+								this.topadd)) + "&bottom=" + encodeURIComponent(JSON.stringify(this
+								.bottomadd)) +
+							'&leftname=' + this
+							.leftname + "&rightname=" + this.rightname + "&container_id=" + this
+							.container_id +
+							"&unit_price=" + this.unit_price+'&all=' + res
+					})
+				}).catch(() => {
 
+				})
+			},
 			//拼包列表
 			getexpress() {
 				uni.$u.http.get('/api/express-group-package', {
@@ -363,14 +390,17 @@
 				})
 			},
 			todev() {
-				uni.navigateTo({
-					url: "/pageB/delivery?goodinfo=" + encodeURIComponent(JSON.stringify(this.goodinfo)) +
-						"&topadd=" + encodeURIComponent(JSON.stringify(
-							this.topadd)) + "&bottom=" + encodeURIComponent(JSON.stringify(this.bottomadd)) +
-						'&leftname=' + this
-						.leftname + "&rightname=" + this.rightname + "&container_id=" + this.container_id +
-						"&unit_price=" + this.unit_price
-				})
+				if (JSON.stringify(this.topadd) === '{}') {
+					this.$u.toast('请填写寄件人地址')
+				} else if (JSON.stringify(this.bottomadd) === '{}') {
+					this.$u.toast('请填写收件人地址')
+				} else if (JSON.stringify(this.goodinfo) === '{}') {
+					this.$u.toast('请填写物品信息')
+				} else if (this.leftname == '') {
+					this.$u.toast('请选择物流方式')
+				} else {
+					this.calculate()
+				}
 			},
 			count() {
 				uni.navigateTo({
@@ -379,7 +409,8 @@
 			},
 			pack(index) {
 				uni.navigateTo({
-					url: '/pageB/myPackage?index=' + index
+					// url: '/pageB/myPackage?index=' + index
+					url: "/pageC/myPackage/myPackage?type=" + index,
 				})
 			},
 			more() {

pages/index/index.vue

@@ -313,7 +313,7 @@
 			//海外包邮接口
 			shipp() {
 				uni.$u.http.post('api/goods/shipping').then((res) => {
-					this.shippList = res.splice(0, 2)
+					this.shippList = res.data.splice(0, 2)
 				}).catch(() => {
 
 				})
@@ -321,7 +321,7 @@
 			//拼包好物接口
 			pack() {
 				uni.$u.http.post('/api/goods/pack').then((res) => {
-					this.packlist = res.splice(0, 2)
+					this.packlist = res.data.splice(0, 2)
 				}).catch(() => {
 
 				})
@@ -329,7 +329,8 @@
 			//百万补贴接口
 			subsid() {
 				uni.$u.http.post('/api/goods/subsidy').then((res) => {
-					this.subsidylist = res.splice(0, 4)
+					console.log(res);
+					this.subsidylist = res.data.splice(0, 4)
 				}).catch(() => {
 
 				})

pages/login/login.vue

@@ -1,187 +1,187 @@
 <template>
-  <!-- 登录 -->
-  <view
-    style="
+	<!-- 登录 -->
+	<view style="
       padding: 0 44rpx;
       background-color: #fff;
       height: 100vh;
       overflow: hidden;
-    "
-  >
-    <view class="" style="text-align: center; margin-top: 156rpx">
-      <image
-        src="../../static/images/logo.png"
-        style="width: 350rpx; height: 350rpx"
-        mode=""
-      ></image>
-    </view>
-    <button
-      open-type="getPhoneNumber"
-      class="login-btn"
-      @getphonenumber="tologin"
-    >
-      微信授权登录
-    </button>
+    ">
+		<view class="" style="text-align: center; margin-top: 156rpx">
+			<image src="../../static/images/logo.png" style="width: 350rpx; height: 350rpx" mode=""></image>
+		</view>
+		<button open-type="getPhoneNumber" class="login-btn" @getphonenumber="tologin">
+			微信授权登录
+		</button>
 
-    <!-- 		<view>
+		<view>
 			<u--input placeholder="请输入内容" border="surround" v-model="mobile"></u--input>
 			<u--input placeholder="请输入内容" border="surround" v-model="code"></u--input>
-		</view> -->
-    <!-- <button @click="submit">登录</button> -->
-    <view class="" style="margin-top: 42rpx; display: flex">
-      <u-checkbox-group
-        v-model="checkboxValue1"
-        placement="column"
-        @change="checkboxChange"
-      >
-        <u-checkbox
-          shape="circle"
-          :customStyle="{ marginBottom: '8px' }"
-          :name="1"
-        >
-        </u-checkbox>
-      </u-checkbox-group>
-      <text class="fontYin">我已阅读并同意</text>
-      <text class="fontYin" style="color: #f83224">《用户协议》</text>
-      <text class="fontYin">和</text>
-      <text class="fontYin" style="color: #f83224">《隐私协议》</text>
-    </view>
-  </view>
+		</view>
+		<button @click="submit">登录</button>
+		<button @click="submita">注册</button>
+		<view class="" style="margin-top: 42rpx; display: flex">
+			<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+				<u-checkbox shape="circle" :customStyle="{ marginBottom: '8px' }" :name="1">
+				</u-checkbox>
+			</u-checkbox-group>
+			<text class="fontYin">我已阅读并同意</text>
+			<text class="fontYin" style="color: #f83224">《用户协议》</text>
+			<text class="fontYin">和</text>
+			<text class="fontYin" style="color: #f83224">《隐私协议》</text>
+		</view>
+	</view>
 </template>
 
 <script>
-import { login } from "../../network/api/homeApi.js";
-export default {
-  data() {
-    return {
-      mobile: "",
-      code: "",
-      checkboxValue1: false,
-      changea: [],
-    };
-  },
-  methods: {
-    //微信登录
-    tologin(e) {
-      if (this.changea.length > 0) {
-        if (e.detail.code) {
-          var phoneCode = e.detail.code;
-          uni.login({
-            success: (code) => {
-              uni.$u.http
-                .post("/api/wxmini/login", {
-                  code: code.code,
-                })
-                .then((res) => {
-                  console.log(res);
-                  if (res == 10011) {
-                    uni.$u.http
-                      .post("/api/wxmini/mobile", {
-                        code: phoneCode,
-                      })
-                      .then((res) => {
-                        uni.$u.http
-                          .post("/api/register", {
-                            wx_code: code.code, //		是	String	微信登录时候的code
-                            mobile: res.mobile, //	是	String	手机号码
-                          })
-                          .then((res) => {
-                            console.log(res);
-                            uni.setStorageSync("token", res.token);
-                            uni.setStorageSync("openid", res.openid);
-                            setTimeout(() => {
-                              uni.navigateTo({
-                                url: "/pageA/changelange",
-                              });
-                            }, 300);
-                          })
-                          .catch(() => {});
-                      })
-                      .catch(() => {});
-                  } else {
-                    uni.setStorageSync("token", res.token);
-                    uni.setStorageSync("openid", res.openid);
-                    setTimeout(() => {
-                      uni.navigateTo({
-                        url: "/pageA/changelange",
-                      });
-                    }, 300);
-                  }
-                })
-                .catch(() => {});
-            },
-          });
-        }
-      } else {
-        this.$u.toast("请勾选隐私协议");
-      }
-    },
-    checkboxChange(n) {
-      console.log("change", n);
-      this.changea = n;
-    },
-    submit() {
-      // login({ mobile: "13000000000", password: "123456" }).then((res) => {
-      //   console.log(res);
-      //   if (res.data.code == 10000) {
-      //     uni.setStorage({
-      //       key: "token",
-      //       data: res.data.data.token,
-      //       success: function () {
-      //         uni.switchTab({
-      //           url: "../index/index",
-      //         });
-      //       },
-      //     });
-      //   }
-      // });
-      uni.$u.http
-        .post("/api/login", {
-          mobile: "13000000000",
-          password: "123456",
-        })
-        .then((res) => {
-          uni.setStorageSync("token", res.token);
-          uni.switchTab({
-            url: "/pages/index/index",
-          });
-        })
-        .catch((error) => {
-          console.log(error);
-        });
-    },
-  },
-};
+	import {
+		login
+	} from "../../network/api/homeApi.js";
+	export default {
+		data() {
+			return {
+				mobile: "",
+				code: "",
+				checkboxValue1: false,
+				changea: [],
+			};
+		},
+		methods: {
+			//微信登录
+			tologin(e) {
+				if (this.changea.length > 0) {
+					if (e.detail.code) {
+						var phoneCode = e.detail.code;
+						uni.login({
+							success: (code) => {
+								uni.$u.http
+									.post("/api/wxmini/login", {
+										code: code.code,
+									})
+									.then((res) => {
+										console.log(res);
+										if (res == 10011) {
+											uni.$u.http
+												.post("/api/wxmini/mobile", {
+													code: phoneCode,
+												})
+												.then((res) => {
+													uni.$u.http
+														.post("/api/register", {
+															wx_code: code
+																.code, //		是	String	微信登录时候的code
+															mobile: res.mobile, //	是	String	手机号码
+														})
+														.then((res) => {
+															console.log(res);
+															uni.setStorageSync("token", res.token);
+															uni.setStorageSync("openid", res
+																.openid);
+															setTimeout(() => {
+																uni.navigateTo({
+																	url: "/pageA/changelange",
+																});
+															}, 300);
+														})
+														.catch(() => {});
+												})
+												.catch(() => {});
+										} else {
+											uni.setStorageSync("token", res.token);
+											uni.setStorageSync("openid", res.openid);
+											setTimeout(() => {
+												uni.navigateTo({
+													url: "/pageA/changelange",
+												});
+											}, 300);
+										}
+									})
+									.catch(() => {});
+							},
+						});
+					}
+				} else {
+					this.$u.toast("请勾选隐私协议");
+				}
+			},
+			checkboxChange(n) {
+				console.log("change", n);
+				this.changea = n;
+			},
+			submit() {
+				// login({ mobile: "13000000000", password: "123456" }).then((res) => {
+				//   console.log(res);
+				//   if (res.data.code == 10000) {
+				//     uni.setStorage({
+				//       key: "token",
+				//       data: res.data.data.token,
+				//       success: function () {
+				//         uni.switchTab({
+				//           url: "../index/index",
+				//         });
+				//       },
+				//     });
+				//   }
+				// });
+				uni.$u.http
+					.post("/api/login", {
+						mobile: this.mobile,
+						password: '123456',
+					})
+					.then((res) => {
+						uni.setStorageSync("token", res.token);
+						uni.switchTab({
+							url: "/pages/index/index",
+						});
+					})
+					.catch((error) => {
+						console.log(error);
+					});
+			},
+			submita() {
+				uni.$u.http
+					.post("/api//mobile-register", {
+						mobile: this.mobile,
+						password: '123456',
+					})
+					.then((res) => {
+						uni.$u.toast('注册成功')
+					})
+					.catch((error) => {
+						console.log(error);
+					});
+			}
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-page {
-  background-color: #ffffff !important;
-  height: 100vh;
-}
+	page {
+		background-color: #ffffff !important;
+		height: 100vh;
+	}
 
-.login-btn {
-  width: 662rpx;
-  height: 96rpx;
-  background: #f83224;
-  box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
-  border-radius: 48rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #ffffff;
-  line-height: 96rpx;
-  text-align: center;
-  font-style: normal;
-}
+	.login-btn {
+		width: 662rpx;
+		height: 96rpx;
+		background: #f83224;
+		box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
+		border-radius: 48rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #ffffff;
+		line-height: 96rpx;
+		text-align: center;
+		font-style: normal;
+	}
 
-.fontYin {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #666666;
-  line-height: 34rpx;
-  text-align: left;
-  font-style: normal;
-}
-</style>
+	.fontYin {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #666666;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+	}
+</style>

pages/shopping/shopping.vue

@@ -143,11 +143,12 @@
 					keyword: this.keyword,
 					page: this.page
 				}).then((res) => {
+					console.log(res);
+					this.last_page = res.last_page
 					if (this.page == 1) {
 						this.list = res.data
-						this.last_page = res.data.last_page
 					} else {
-						this.list.concat(res.data)
+						this.list =  this.list.concat(res.data)
 					}
 
 				}).catch(() => {
@@ -198,6 +199,8 @@
 				})
 			},
 			changetab(item) {
+				this.list = []
+				this.page = 1
 				this.parent_id = item.id
 				console.log('item', item);
 				this.shipp(item.id)
@@ -214,7 +217,7 @@
 <style lang="scss" scoped>
 	.content {
 		width: 750rpx;
-		// height: 1332rpx;
+		min-height: calc(100vh - 40rpx);
 		background: linear-gradient(180deg, #FDFCFB 0%, #F4F4F4 100%);
 		border-radius: 30rpx 30rpx 0rpx 0rpx;
 		margin-top: 32rpx;

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

@@ -34,11 +34,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 218);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=0&lang=css& */ 220);
-<<<<<<< HEAD
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
-=======
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 
 var renderjs
 
@@ -48,11 +44,7 @@ var renderjs
 
 /* normalize component */
 
-<<<<<<< HEAD
 var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__["default"])(
-=======
-var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__["default"])(
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -191,44 +183,25 @@ exports.default = _default;
 /***/ }),
 
 /***/ 220:
-<<<<<<< HEAD
 /*!***************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue?vue&type=style&index=0&lang=css& ***!
   \***************************************************************************************************/
-=======
-/*!**************************************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=style&index=0&lang=css& ***!
-  \**************************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-<<<<<<< HEAD
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=style&index=0&lang=css& */ 221);
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
-=======
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=style&index=0&lang=css& */ 221);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 
 /***/ }),
 
 /***/ 221:
-<<<<<<< HEAD
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue?vue&type=style&index=0&lang=css& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=style&index=0&lang=css& ***!
-  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

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

@@ -1,15 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageB/index"],{
 
 /***/ 348:
-<<<<<<< HEAD
 /*!***********************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
   \***********************************************************************************/
-=======
-/*!**********************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
-  \**********************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -28,15 +22,9 @@ createPage(_index.default);
 /***/ }),
 
 /***/ 349:
-<<<<<<< HEAD
 /*!******************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue ***!
   \******************************************************************/
-=======
-/*!*****************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageB/index.vue ***!
-  \*****************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -73,27 +61,16 @@ component.options.__file = "pageB/index.vue"
 /***/ }),
 
 /***/ 350:
-<<<<<<< HEAD
 /*!*************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
   \*************************************************************************************************/
-=======
-/*!************************************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
-  \************************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-<<<<<<< HEAD
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 351);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"]; });
-=======
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 351);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"]; });
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
@@ -106,15 +83,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 351:
-<<<<<<< HEAD
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
-  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -139,44 +110,25 @@ render._withStripped = true
 /***/ }),
 
 /***/ 352:
-<<<<<<< HEAD
 /*!*******************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************************/
-=======
-/*!******************************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
-  \******************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-<<<<<<< HEAD
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 353);
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
-=======
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 353);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 
 /***/ }),
 
 /***/ 353:
-<<<<<<< HEAD
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

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

@@ -1,15 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageC/index"],{
 
 /***/ 464:
-<<<<<<< HEAD
 /*!***********************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
   \***********************************************************************************/
-=======
-/*!**********************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
-  \**********************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -28,15 +22,9 @@ createPage(_index.default);
 /***/ }),
 
 /***/ 465:
-<<<<<<< HEAD
 /*!******************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue ***!
   \******************************************************************/
-=======
-/*!*****************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageC/index.vue ***!
-  \*****************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -73,27 +61,16 @@ component.options.__file = "pageC/index.vue"
 /***/ }),
 
 /***/ 466:
-<<<<<<< HEAD
 /*!*************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
   \*************************************************************************************************/
-=======
-/*!************************************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
-  \************************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-<<<<<<< HEAD
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 467);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"]; });
-=======
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 467);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"]; });
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
@@ -106,15 +83,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 467:
-<<<<<<< HEAD
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
-  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -139,44 +110,25 @@ render._withStripped = true
 /***/ }),
 
 /***/ 468:
-<<<<<<< HEAD
 /*!*******************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************************/
-=======
-/*!******************************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
-  \******************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-<<<<<<< HEAD
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 469);
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
-=======
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 469);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 
 /***/ }),
 
 /***/ 469:
-<<<<<<< HEAD
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

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

@@ -1,15 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageD/index"],{
 
 /***/ 652:
-<<<<<<< HEAD
 /*!***********************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
   \***********************************************************************************/
-=======
-/*!**********************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
-  \**********************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -28,15 +22,9 @@ createPage(_index.default);
 /***/ }),
 
 /***/ 653:
-<<<<<<< HEAD
 /*!******************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue ***!
   \******************************************************************/
-=======
-/*!*****************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageD/index.vue ***!
-  \*****************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -73,27 +61,16 @@ component.options.__file = "pageD/index.vue"
 /***/ }),
 
 /***/ 654:
-<<<<<<< HEAD
 /*!*************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
   \*************************************************************************************************/
-=======
-/*!************************************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
-  \************************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-<<<<<<< HEAD
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 655);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
-=======
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 655);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
@@ -106,15 +83,9 @@ __webpack_require__.r(__webpack_exports__);
 /***/ }),
 
 /***/ 655:
-<<<<<<< HEAD
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
-  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -139,44 +110,25 @@ render._withStripped = true
 /***/ }),
 
 /***/ 656:
-<<<<<<< HEAD
 /*!*******************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************************/
-=======
-/*!******************************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
-  \******************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-<<<<<<< HEAD
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 657);
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
-=======
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 657);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 
 /***/ }),
 
 /***/ 657:
-<<<<<<< HEAD
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 201febc9a234a4b08f24e7982b56e51a98f422a9
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/pages/express/express.js

@@ -506,9 +506,33 @@ var _default = {
     }
   },
   methods: {
+    //价格计算
+    calculate: function calculate() {
+      var _this = this;
+      uni.$u.http.get('/api/express-order/calculate', {
+        params: {
+          container_id: this.container_id,
+          // 是 String 货柜ID
+          weight: this.goodinfo.weight,
+          //是 String 重量(kg)
+          length: this.goodinfo.length,
+          //是 String 长(m)
+          width: this.goodinfo.width,
+          //是 String 宽(m)
+          height: this.goodinfo.height,
+          //是 String 高(m)
+          type: this.goodinfo.goodtype //是 String 商品类型: normal.普通商品,
+        }
+      }).then(function (res) {
+        console.log(res);
+        uni.navigateTo({
+          url: "/pageB/delivery?goodinfo=" + encodeURIComponent(JSON.stringify(_this.goodinfo)) + "&topadd=" + encodeURIComponent(JSON.stringify(_this.topadd)) + "&bottom=" + encodeURIComponent(JSON.stringify(_this.bottomadd)) + '&leftname=' + _this.leftname + "&rightname=" + _this.rightname + "&container_id=" + _this.container_id + "&unit_price=" + _this.unit_price + '&all=' + res
+        });
+      }).catch(function () {});
+    },
     //拼包列表
     getexpress: function getexpress() {
-      var _this = this;
+      var _this2 = this;
       uni.$u.http.get('/api/express-group-package', {
         params: {
           is_page: 0,
@@ -519,7 +543,7 @@ var _default = {
           type: ''
         }
       }).then(function (res) {
-        _this.expressList = res;
+        _this2.expressList = res;
       }).catch(function () {});
     },
     //跨境物流选择
@@ -532,11 +556,11 @@ var _default = {
     },
     //物流选择
     changewu: function changewu() {
-      var _this2 = this;
+      var _this3 = this;
       if (this.province_id) {
         this.logshow = true;
         setTimeout(function () {
-          _this2.$refs.child.transport();
+          _this3.$refs.child.transport();
         }, 800);
       } else {
         this.$u.toast('请先选择城市');
@@ -577,18 +601,26 @@ var _default = {
     },
     //我的包裹
     express: function express() {
-      var _this3 = this;
+      var _this4 = this;
       uni.$u.http.get('/api/express-order/status-count', {}).then(function (res) {
         console.log(res);
-        _this3.overseas = res.to_overseas;
-        _this3.receipt = res.transit_receipt;
-        _this3.transit = res.to_transit;
+        _this4.overseas = res.to_overseas;
+        _this4.receipt = res.transit_receipt;
+        _this4.transit = res.to_transit;
       }).catch(function () {});
     },
     todev: function todev() {
-      uni.navigateTo({
-        url: "/pageB/delivery?goodinfo=" + encodeURIComponent(JSON.stringify(this.goodinfo)) + "&topadd=" + encodeURIComponent(JSON.stringify(this.topadd)) + "&bottom=" + encodeURIComponent(JSON.stringify(this.bottomadd)) + '&leftname=' + this.leftname + "&rightname=" + this.rightname + "&container_id=" + this.container_id + "&unit_price=" + this.unit_price
-      });
+      if (JSON.stringify(this.topadd) === '{}') {
+        this.$u.toast('请填写寄件人地址');
+      } else if (JSON.stringify(this.bottomadd) === '{}') {
+        this.$u.toast('请填写收件人地址');
+      } else if (JSON.stringify(this.goodinfo) === '{}') {
+        this.$u.toast('请填写物品信息');
+      } else if (this.leftname == '') {
+        this.$u.toast('请选择物流方式');
+      } else {
+        this.calculate();
+      }
     },
     count: function count() {
       uni.navigateTo({
@@ -597,7 +629,8 @@ var _default = {
     },
     pack: function pack(index) {
       uni.navigateTo({
-        url: '/pageB/myPackage?index=' + index
+        // url: '/pageB/myPackage?index=' + index
+        url: "/pageC/myPackage/myPackage?type=" + index
       });
     },
     more: function more() {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -508,21 +508,22 @@ var _default = {
     shipp: function shipp() {
       var _this2 = this;
       uni.$u.http.post('api/goods/shipping').then(function (res) {
-        _this2.shippList = res.splice(0, 2);
+        _this2.shippList = res.data.splice(0, 2);
       }).catch(function () {});
     },
     //拼包好物接口
     pack: function pack() {
       var _this3 = this;
       uni.$u.http.post('/api/goods/pack').then(function (res) {
-        _this3.packlist = res.splice(0, 2);
+        _this3.packlist = res.data.splice(0, 2);
       }).catch(function () {});
     },
     //百万补贴接口
     subsid: function subsid() {
       var _this4 = this;
       uni.$u.http.post('/api/goods/subsidy').then(function (res) {
-        _this4.subsidylist = res.splice(0, 4);
+        console.log(res);
+        _this4.subsidylist = res.data.splice(0, 4);
       }).catch(function () {});
     },
     //标签切换

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -100,6 +100,9 @@ __webpack_require__.r(__webpack_exports__);
 var components
 try {
   components = {
+    "u-Input": function () {
+      return Promise.all(/*! import() | uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u--input/u--input.vue */ 959))
+    },
     uCheckboxGroup: function () {
       return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 910))
     },
@@ -202,23 +205,6 @@ var _homeApi = __webpack_require__(/*! ../../network/api/homeApi.js */ 211);
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 var _default = {
   data: function data() {
     return {
@@ -296,8 +282,8 @@ var _default = {
       //   }
       // });
       uni.$u.http.post("/api/login", {
-        mobile: "13000000000",
-        password: "123456"
+        mobile: this.mobile,
+        password: '123456'
       }).then(function (res) {
         uni.setStorageSync("token", res.token);
         uni.switchTab({
@@ -306,6 +292,16 @@ var _default = {
       }).catch(function (error) {
         console.log(error);
       });
+    },
+    submita: function submita() {
+      uni.$u.http.post("/api//mobile-register", {
+        mobile: this.mobile,
+        password: '123456'
+      }).then(function (res) {
+        uni.$u.toast('注册成功');
+      }).catch(function (error) {
+        console.log(error);
+      });
     }
   }
 };

unpackage/dist/dev/mp-weixin/pages/login/login.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "登录",
   "enablePullDownRefresh": false,
   "usingComponents": {
+    "u--input": "/uview-ui/components/u--input/u--input",
     "u-checkbox-group": "/uview-ui/components/u-checkbox-group/u-checkbox-group",
     "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox"
   }

unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js

@@ -316,11 +316,12 @@ var _default = {
         keyword: this.keyword,
         page: this.page
       }).then(function (res) {
+        console.log(res);
+        _this.last_page = res.last_page;
         if (_this.page == 1) {
           _this.list = res.data;
-          _this.last_page = res.data.last_page;
         } else {
-          _this.list.concat(res.data);
+          _this.list = _this.list.concat(res.data);
         }
       }).catch(function () {});
     },
@@ -366,6 +367,8 @@ var _default = {
       }).catch(function () {});
     },
     changetab: function changetab(item) {
+      this.list = [];
+      this.page = 1;
       this.parent_id = item.id;
       console.log('item', item);
       this.shipp(item.id);