解决冲突

commont/messages.js

@@ -270,6 +270,9 @@ export default {
       firmaPer: "中转已签收",
       oltreoceano: "正发往海外",
       piattaforma: "平台自购",
+      //个人功能
+      thatPerson: "个人功能",
+      become: "成为团长",
     },
   },
   //英语
@@ -539,6 +542,9 @@ export default {
       team: "Team leader",
       people: "people follow",
       see: "View Home Page",
+      //个人功能
+      thatPerson: "Personal functions",
+      become: "Become a team leader",
     },
   },
   // 西班牙
@@ -810,6 +816,9 @@ export default {
       team: "Jefe del regimiento",
       people: "Atención humana",
       see: "Ver página de inicio",
+      //个人功能
+      thatPerson: "Función personal",
+      become: "Convertirse en Jefe de grupo",
     },
   },
   //意大利
@@ -1081,6 +1090,9 @@ export default {
       team: "Team leader",
       people: "La gente segue",
       see: "Visualizza Home Page",
+      //个人功能
+      thatPerson: "Funzioni personali",
+      become: "Diventa un team leader",
     },
   },
 };

pageA/payorder.vue

@@ -1,323 +1,444 @@
 <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="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="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="">
 					<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;">{{i18n.Paymentinstructions}}</view>
-			<view class="content" style="margin-top: 18rpx;">1.联系客服付款需走线下支付通道，付款成</view>
-		</view>
-		<view class="confirm" @click="confirm">
-			{{i18n.Confirmpayment}}
-		</view>
-	</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">{{
+        i18n.Paymentinstructions
+      }}</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(() => {
+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());
 
-				})
-			},
-			//汇率列表
-			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() {
-				if (this.type == '') {
-					uni.$u.http.post('/api/order/payment', {
-						order_id: this.orderid,
-						pay_type: this.pay_type
-					}).then((res) => {
-						uni.navigateTo({
-							url: 'confirm'
-						})
-					}).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) => {
+            console.log(res);
+            this.$u.toast("支付成功");
+            setTimeout(() => {
+              uni.switchTab({
+                url: "/pages/express/express",
+              });
+            }, 800);
+            // uni.navigateTo({
+            // 	url: 'confirm'
+            // })
+          })
+          .catch(() => {});
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.payment {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 24rpx;
-		color: #222222;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.payment {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 24rpx;
+  color: #222222;
+  line-height: 34rpx;
+  text-align: left;
+  font-style: normal;
+}
 
-	.content {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 20rpx;
-		color: #777777;
-		line-height: 28rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.content {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #777777;
+  line-height: 28rpx;
+  text-align: left;
+  font-style: normal;
+}
 
-	.stateac {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #FF1515;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.stateac {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #ff1515;
+  line-height: 34rpx;
+  text-align: left;
+  font-style: normal;
+}
 
-	.unstate {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #222222;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.unstate {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #222222;
+  line-height: 34rpx;
+  text-align: left;
+  font-style: normal;
+}
 
-	.confirm {
-		position: fixed;
-		bottom: 66rpx;
-		width: 702rpx;
-		height: 84rpx;
-		background: #F83224;
-		border-radius: 44rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #FFFFFF;
-		line-height: 84rpx;
-		text-align: center;
-		font-style: normal;
-	}
+.confirm {
+  position: fixed;
+  bottom: 66rpx;
+  width: 702rpx;
+  height: 84rpx;
+  background: #f83224;
+  border-radius: 44rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #ffffff;
+  line-height: 84rpx;
+  text-align: center;
+  font-style: normal;
+}
 
-	.payitem {
-		width: 702rpx;
-		height: 140rpx;
-		background: #FFFFFF;
-		border-radius: 12rpx;
-		padding: 34rpx 24rpx;
-		box-sizing: border-box;
-	}
+.payitem {
+  width: 702rpx;
+  height: 140rpx;
+  background: #ffffff;
+  border-radius: 12rpx;
+  padding: 34rpx 24rpx;
+  box-sizing: border-box;
+}
 
-	.back {
-		padding: 20rpx 24rpx;
-		box-sizing: border-box;
+.back {
+  padding: 20rpx 24rpx;
+  box-sizing: border-box;
 
-		.topbox {
-			position: relative;
+  .topbox {
+    position: relative;
 
-			.state {
-				width: 128rpx;
-				// height: 56rpx;
-				background: #FFFFFF;
-				border-radius: 6rpx;
-				padding: 12rpx;
-				box-sizing: border-box;
-			}
+    .state {
+      width: 128rpx;
+      // height: 56rpx;
+      background: #ffffff;
+      border-radius: 6rpx;
+      padding: 12rpx;
+      box-sizing: border-box;
+    }
 
-			.paysum {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #222222;
-				line-height: 40rpx;
-				text-align: left;
-				font-style: normal;
-			}
+    .paysum {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #222222;
+      line-height: 40rpx;
+      text-align: left;
+      font-style: normal;
+    }
 
-			.numbe {
-				font-family: HarmonyOS_Sans_Medium;
-				font-size: 28rpx;
-				color: #000000;
-				line-height: 38rpx;
-				text-align: left;
-				font-style: normal;
-				margin-top: 20rpx;
-			}
-		}
-	}
-</style>
+    .numbe {
+      font-family: HarmonyOS_Sans_Medium;
+      font-size: 28rpx;
+      color: #000000;
+      line-height: 38rpx;
+      text-align: left;
+      font-style: normal;
+      margin-top: 20rpx;
+    }
+  }
+}
+</style>

pageC/mineFollow/mineFollow.vue

@@ -89,18 +89,7 @@ export default {
     return {
       follow: 0,
       commodityList: [],
-      teamList: [
-        {
-          img: "http://pic.imeitou.com/uploads/allimg/240522/10-2405221F140.jpg",
-          name: "张三",
-          score: 4.5,
-        },
-        {
-          img: "http://pic.imeitou.com/uploads/allimg/240522/10-2405221F140.jpg",
-          name: "张三",
-          score: 4.5,
-        },
-      ],
+      teamList: [],
     };
   },
   computed: {

pageC/orderForm/component/orderInofrmation.vue

@@ -70,7 +70,11 @@
       >
         取消订单
       </button>
-      <button class="status-2" v-if="itemInfo.order.status == 'unpaid'">
+      <button
+        class="status-2"
+        v-if="itemInfo.order.status == 'unpaid'"
+        @click.stop="$emit('toPay', itemInfo)"
+      >
         继续付款
       </button>
       <button
@@ -102,7 +106,11 @@
       >
         再来一单
       </button>
-      <button class="status-2" v-if="itemInfo.order.status == 'delivered'">
+      <button
+        class="status-2"
+        v-if="itemInfo.order.status == 'delivered'"
+        @click.stop="$emit('confirm', itemInfo)"
+      >
         确认收货
       </button>
 

pageC/orderForm/component/refundCard.vue

@@ -25,6 +25,11 @@
         v-if="itemInfo.order_goods[0].refund.status == 2"
         >拒绝退款</text
       >
+      <text
+        class="order-status"
+        v-if="itemInfo.order_goods[0].refund.status == 3"
+        >平台介入</text
+      >
     </view>
     <view class="commodity-information" v-for="item in itemInfo.order_goods">
       <view class="commodity-1">

pageC/orderForm/orderForm.vue

@@ -65,6 +65,8 @@
             :itemInfo="item"
             @toDetail="toDetail"
             @cancellationOrder="cancellationOrder"
+            @confirm="confirm"
+            @toPay="toPay"
           />
         </view>
         <view v-else>
@@ -119,6 +121,7 @@ export default {
     },
     //切换搜索订单状态
     tabSwitch(num) {
+      this.page = 1;
       this.follow = num;
       this.getOrderList(1);
     },
@@ -129,18 +132,45 @@ export default {
       });
     },
 
+    //确认收货
+    confirm(value) {
+      this.agreeShow = true;
+      this.title = "是否确认收货";
+      this.cancellation = value;
+    },
+
+    //跳转支付
+    toPay(value) {
+      uni.navigateTo({
+        url: `/pageA/payorder?sum=${value.order.amount}&orderid=${value.order.id}`,
+      });
+    },
+
+    //关闭确认弹窗
     close(value) {
       this.agreeShow = false;
       if (value) {
-        uni.$u.http
-          .post(`/api/order/cancel/${this.cancellation.order.id}`)
-          .then((res) => {
-            uni.showToast({
-              title: "订单已取消",
-              icon: "none",
+        if (this.title == "是否确认取消订单") {
+          uni.$u.http
+            .post(`/api/order/cancel/${this.cancellation.order.id}`)
+            .then((res) => {
+              uni.showToast({
+                title: "订单已取消",
+                icon: "none",
+              });
+              this.getOrderList(1);
+            });
+        } else if (this.title == "是否确认收货") {
+          uni.$u.http
+            .post(`/api/order/receive/${this.cancellation.order.id}`)
+            .then((res) => {
+              uni.showToast({
+                title: "订单已收货",
+                icon: "none",
+              });
+              this.getOrderList(1);
             });
-            this.getOrderList(1);
-          });
+        }
       }
     },
 

pageD/resultFeedback/resultFeedback.vue

@@ -5,7 +5,7 @@
       <view class="wait">审核中</view>
       <view class="review">审核中，请耐心等待~</view>
     </view>
-    <view class="content" v-else-if="information.status == 1">
+    <view class="content" v-else-if="information.status == 2">
       <image class="logo" src="../../static/mine/351.png" mode=""></image>
       <view class="wait">审核失败</view>
       <view class="review">未通过，请重新提交信息</view>
@@ -18,8 +18,11 @@
         >请访问以下pc端地址进行店铺信息维护以及 商品信息的发布</view
       >
       <view class="inp">
-        <view class="url">111</view>
-        <view style="color: #f83224; font-size: 26rpx" @click="cope('1111')">
+        <view class="url">https://cbec-admin.hdlkeji.com/#/login</view>
+        <view
+          style="color: #f83224; font-size: 26rpx"
+          @click="cope('https://cbec-admin.hdlkeji.com/#/login')"
+        >
           复制链接
         </view>
       </view>
@@ -127,6 +130,9 @@ export default {
         width: 80%;
         font-size: 28rpx;
         color: #777;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
       }
     }
     .account {

pages/login/login.vue

@@ -1,156 +1,187 @@
 <template>
-	<!-- 登录 -->
-	<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
+    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>
+    <!-- 		<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>
+    <!-- <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>
 </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) => {
-												uni.setStorageSync('token', res.token)
-												setTimeout(() => {
-													uni.navigateTo({
-														url: '/pageA/changelange'
-													})
-												}, 300)
-											}).catch(() => {
-
-											})
-										}).catch(() => {
-
-										})
-									} else {
-										uni.setStorageSync('token', res.token)
-										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: "13000000000",
+          password: "123456",
+        })
+        .then((res) => {
+          uni.setStorageSync("token", res.token);
+          uni.switchTab({
+            url: "/pages/index/index",
+          });
+        })
+        .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/mine/component/personalFunction.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 个人功能 -->
   <view class="team">
-    <text class="team-title">个人功能</text>
+    <text class="team-title">{{ i18n.thatPerson }}</text>
     <view class="function-team">
       <view class="icon-center" @click="toSetleIn">
         <image
@@ -9,7 +9,7 @@
           src="../../../static/mine/322.png"
           mode=""
         ></image>
-        <view class="characters">成为团长</view>
+        <view class="characters">{{ i18n.become }}</view>
       </view>
       <view class="icon-center">
         <image
@@ -17,7 +17,7 @@
           src="../../../static/mine/317.png"
           mode=""
         ></image>
-        <view class="characters">联系客服</view>
+        <view class="characters">{{ i18n.pontact }}</view>
       </view>
       <view class="icon-center" @click="toSetup">
         <image
@@ -25,7 +25,7 @@
           src="../../../static/mine/321.png"
           mode=""
         ></image>
-        <view class="characters">账号设置</view>
+        <view class="characters">{{ i18n.accountSettings }}</view>
       </view>
     </view>
   </view>
@@ -36,12 +36,18 @@ export default {
   data() {
     return {};
   },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   methods: {
     toSetup() {
       uni.navigateTo({
         url: "/pageC/accountSetup/accountSetup",
       });
     },
+
     toSetleIn() {
       uni.$u.http.post(`/api/merchant/status`).then((res) => {
         console.log(res);

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

@@ -34,7 +34,11 @@ __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
 
@@ -44,7 +48,11 @@ 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"],
@@ -183,25 +191,44 @@ 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,9 +1,15 @@
 (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__) {
 
@@ -22,9 +28,15 @@ 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__) {
 
@@ -61,16 +73,27 @@ 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"]; });
 
@@ -83,9 +106,15 @@ __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__) {
 
@@ -110,25 +139,44 @@ 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,9 +1,15 @@
 (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__) {
 
@@ -22,9 +28,15 @@ 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__) {
 
@@ -61,16 +73,27 @@ 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"]; });
 
@@ -83,9 +106,15 @@ __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__) {
 
@@ -110,25 +139,44 @@ 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,9 +1,15 @@
 (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__) {
 
@@ -22,9 +28,15 @@ 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__) {
 
@@ -61,16 +73,27 @@ 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"]; });
 
@@ -83,9 +106,15 @@ __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__) {
 
@@ -110,25 +139,44 @@ 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/login/login.js

@@ -196,6 +196,29 @@ var _homeApi = __webpack_require__(/*! ../../network/api/homeApi.js */ 211);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -213,32 +236,35 @@ var _default = {
           var phoneCode = e.detail.code;
           uni.login({
             success: function success(code) {
-              uni.$u.http.post('/api/wxmini/login', {
+              uni.$u.http.post("/api/wxmini/login", {
                 code: code.code
               }).then(function (res) {
                 console.log(res);
                 if (res == 10011) {
-                  uni.$u.http.post('/api/wxmini/mobile', {
+                  uni.$u.http.post("/api/wxmini/mobile", {
                     code: phoneCode
                   }).then(function (res) {
-                    uni.$u.http.post('/api/register', {
+                    uni.$u.http.post("/api/register", {
                       wx_code: code.code,
                       //		是	String	微信登录时候的code
                       mobile: res.mobile //	是	String	手机号码
                     }).then(function (res) {
-                      uni.setStorageSync('token', res.token);
+                      console.log(res);
+                      uni.setStorageSync("token", res.token);
+                      uni.setStorageSync("openid", res.openid);
                       setTimeout(function () {
                         uni.navigateTo({
-                          url: '/pageA/changelange'
+                          url: "/pageA/changelange"
                         });
                       }, 300);
                     }).catch(function () {});
                   }).catch(function () {});
                 } else {
-                  uni.setStorageSync('token', res.token);
+                  uni.setStorageSync("token", res.token);
+                  uni.setStorageSync("openid", res.openid);
                   setTimeout(function () {
                     uni.navigateTo({
-                      url: '/pageA/changelange'
+                      url: "/pageA/changelange"
                     });
                   }, 300);
                 }
@@ -247,7 +273,7 @@ var _default = {
           });
         }
       } else {
-        this.$u.toast('请勾选隐私协议');
+        this.$u.toast("请勾选隐私协议");
       }
     },
     checkboxChange: function checkboxChange(n) {
@@ -269,13 +295,13 @@ var _default = {
       //     });
       //   }
       // });
-      uni.$u.http.post('/api/login', {
+      uni.$u.http.post("/api/login", {
         mobile: "13000000000",
         password: "123456"
       }).then(function (res) {
-        uni.setStorageSync('token', res.token);
+        uni.setStorageSync("token", res.token);
         uni.switchTab({
-          url: '/pages/index/index'
+          url: "/pages/index/index"
         });
       }).catch(function (error) {
         console.log(error);