联调商品管理

components/kj-tabbar/kj-tabbar.vue

@@ -21,8 +21,10 @@
           <text class="allweight"> {{ goodsWeight }}kg,</text>
           <text class="sum">{{ i18n.total }}:</text>
           <text class="summon">¥</text>
-          <text class="summon" style="font-size: 36rpx">{{ goodsPrice }}</text>
-          <text class="summon">.34</text>
+          <text class="summon" style="font-size: 36rpx">{{
+            goodsPrice.split(".")[0]
+          }}</text>
+          <text class="summon">.{{ goodsPrice.split(".")[1] }}</text>
         </view>
         <view class="settle" @click="account">{{ i18n.GotoResult }}</view>
       </view>
@@ -70,8 +72,8 @@ export default {
       default: 0,
     },
     goodsPrice: {
-      type: Number,
-      default: 0,
+      type: String,
+      default: "",
     },
   },
   computed: {

pageA/productdetails.vue

@@ -1,1193 +1,1512 @@
 <template>
-	<view>
-		<scroll-view ref="scrollView" scroll-y="true" scroll-with-animation="true" style="min-height: 100%;"
-			:scroll-into-view="toView">
-			<!-- 页面内容 -->
-			<!-- 自定义导航栏 -->
-			<u-navbar :safeAreaInsetTop="true" :placeholder='true'>
-				<view class="u-nav-slot u-flex" slot="left" style="display: flex;">
-					<view class="u-flex">
-						<u-icon name="arrow-left" size="19" @click="navigateBack()"></u-icon>
-						<u-tabs :duration='duration' @click="scrollToPosition" :list="list1" lineColor='#fff'
-							:activeStyle=" {color:'#FF1515'}" :inactiveStyle="{
-						color:' #666666' }"></u-tabs>
-					</view>
-					<!-- 				<view class="" style="margin-left: 184rpx;" @click="share = true">
+  <view>
+    <scroll-view
+      ref="scrollView"
+      scroll-y="true"
+      scroll-with-animation="true"
+      style="min-height: 100%"
+      :scroll-into-view="toView"
+    >
+      <!-- 页面内容 -->
+      <!-- 自定义导航栏 -->
+      <u-navbar :safeAreaInsetTop="true" :placeholder="true">
+        <view class="u-nav-slot u-flex" slot="left" style="display: flex">
+          <view class="u-flex">
+            <u-icon
+              name="arrow-left"
+              size="19"
+              @click="navigateBack()"
+            ></u-icon>
+            <u-tabs
+              :duration="duration"
+              @click="scrollToPosition"
+              :list="list1"
+              lineColor="#fff"
+              :activeStyle="{ color: '#FF1515' }"
+              :inactiveStyle="{
+                color: ' #666666',
+              }"
+            ></u-tabs>
+          </view>
+          <!-- 				<view class="" style="margin-left: 184rpx;" @click="share = true">
 					<image src="static/images/share.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
 				</view> -->
-				</view>
-				<view class="u-nav-slot u-flex" slot="right" style="display: flex;">
-					<view class="" style="margin-left: 184rpx;" @click="share = true">
-						<image src="static/images/share.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
-					</view>
-					<view class="" style="width: 180rpx;"></view>
-				</view>
-			</u-navbar>
-			<!-- 商品图片 -->
-			<view class="uni-margin-wrap" id="scroll0">
-				<swiper class="swiper" circular :indicator-dots="false" :autoplay="true">
-					<swiper-item v-if="goodinfo.video">
-						<video style="width: 750rpx;height: 750rpx;" :src='goodinfo.video'></video>
-					</swiper-item>
-					<swiper-item v-for="(item,idx) in goodinfo.images.split(',')" :key="idx">
-						<image src="https://cdn.uviewui.com/uview/swiper/swiper1.png"
-							style="width: 750rpx;height: 750rpx;" mode=""></image>
-					</swiper-item>
-				</swiper>
-			</view>
-			</image>
-			<view class="back">
-				<!-- 折扣 -->
-				<view class="discount">
-					<view class="top">
-						<text class='count' v-if="goodinfo.is_discount==0">{{i18n.Discounted}}</text>
-						<text class='money'>¥</text>
-						<text class='money'
-							style="font-size: 48rpx;">{{goodinfo.is_discount==0?goodinfo.discount_price.slice(0,-3):goodinfo.price.slice(0,-3)}}</text>
-						<text
-							class='money'>{{goodinfo.is_discount==0?goodinfo.discount_price.slice(-3):goodinfo.price.slice(-3)}}</text>
-						<text class='right' v-if="goodinfo.is_discount==0">¥{{goodinfo.price}}</text>
-					</view>
-					<view class="bottom">
-						<text class="tabs">{{i18n.sametype}}</text>
-						<view class="title">
-							<text class="title" selectable @longpress="onLongPress" v-if="language =='zh-CN'">
-								{{goodinfo.name_cn}}
-							</text>
-							<text class="title" selectable @longpress="onLongPress" v-if="language =='en-US'">
-								{{goodinfo.name_en}}
-							</text>
-							<text class="title" selectable @longpress="onLongPress" v-if="language =='es-ES'">
-								{{goodinfo.name_es}}
-							</text>
-							<text class="title" selectable @longpress="onLongPress" v-if="language =='it-IT'">
-								{{goodinfo.name_ita}}
-							</text>
-						</view>
-					</view>
-				</view>
-				<!-- 服务 -->
-				<view class="serve" style="margin-top: 20rpx;">
-					<view class="top u-flex u-row-between" @click="sele">
-						<view class="u-flex">
-							<view class="change">{{i18n.Sele}}</view>
-							<view class="" style="margin-left: 20rpx;">
-								{{selectArr.length>0?selectArr.join(','):i18n.Sele}}
-							</view>
-						</view>
-						<view class="">
-							<u-icon name="arrow-right" size='16'></u-icon>
-						</view>
-					</view>
-					<view class="top u-flex u-row-between" style="margin-top: 36rpx;" @click="serve=true">
-						<view class="u-flex">
-							<view class="change">{{i18n.service}}</view>
-							<view class="" style="margin-left: 20rpx;">正品保障 · 极速退款 · 7天无理由退</view>
-						</view>
-						<view class="">
-							<u-icon name="arrow-right" size='16'></u-icon>
-						</view>
-					</view>
-				</view>
-				<!-- 评论 -->
-				<view class="comment" ref="targetPosition" id="scroll1">
-					<view class="u-flex u-row-between">
-						<text class="ping">{{i18n.review}}</text>
-						<view class="u-flex" @click="tocomment">
-							<text class="strip">{{total}}{{i18n.article + i18n.review}}</text>
-							<u-icon name="arrow-right" size='16'></u-icon>
-						</view>
-					</view>
-					<view class="" v-for="(item,idx) in commentlist" :key="idx">
-						<view class="uesr u-flex u-row-between" style="margin-top: 36rpx;">
-							<view class="u-flex">
-								<image src="../static/images/logo.png" style="width: 52rpx;height: 52rpx;" mode="">
-								</image>
-								<text class="name">{{item.member.nickname}}</text>
-							</view>
-							<text class="strip">{{item.created_at}}</text>
-						</view>
-						<view class="content">
-							{{item.content}}
-						</view>
-						<view class="sku" style="margin-top: 16rpx;">{{
-							item.sku_item.item
-						}}</view>
-					</view>
-				</view>
-				<!-- 店铺 -->
-				<view class="store u-flex u-row-between">
-					<view class="u-flex">
-						<image :src='goodinfo.merchant.image' style="width: 112rpx;height: 112rpx;" mode=""></image>
-						<view class="" style="margin-left: 20rpx;">
-							<view class="title">{{goodinfo.merchant.merchant_name}}</view>
-							<view class="redback u-flex">
-								<uni-rate network allow-half :readonly="true" active-color="red"
-									color="rgba(255, 27, 0, 0.5)" :size='8' :value="5" v-model="rate" />
-								<text style="margin-left: 8rpx;">{{rate}}</text>
-							</view>
-							<view class="" style='margin-top:20rpx'></view>
-							<view class="u-flex" style='margin-top:20rpx'>
-								<text class='num'>{{i18n.Salesvolume}} 2384w+</text>
-								<view class="line"></view>
-								<!-- 评价总数 -->
-								<text class='num'>{{i18n.Salesvolume}} 2384w+</text>
-							</view>
-						</view>
-					</view>
-					<view class="goshop" @click="goshop">{{i18n.stroll}}</view>
-				</view>
-				<!-- 推荐 -->
-				<view class="recommend">
-					<view class="title">
-						{{i18n.Recommended}}
-					</view>
-					<view class="">
-						<swiper style="height: 400rpx;" class="swiper" circular :indicator-dots="true" :autoplay="true">
-							<swiper-item v-for="(parent,index) in swiptlist" :key="index">
-								<view class="u-flex  swiper-item u-row-between">
-									<view class="" v-for="(child,idx) in parent" @click="detail(child.id)" :key="idx">
-										<image :src="child.image" style="width: 214rpx;height: 214rpx;" mode="">
-										</image>
-										<view class="u-line-1"
-											style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;"
-											v-if="language =='zh-CN'">
-											{{child.name_cn}}
-										</view>
-										<view class="u-line-1"
-											style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;"
-											v-if="language =='en-US'">
-											{{child.name_en}}
-										</view>
-										<view class="u-line-1"
-											style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;"
-											v-if="language =='es-ES'">
-											{{child.name_es}}
-										</view>
-										<view class="u-line-1"
-											style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;"
-											v-if="language =='it-IT'">
-											{{child.name_ita}}
-										</view>
-										<view class="" style="margin-top: 12rpx;">
-											<span
-												style="color:rgba(204, 51, 0, 1) ;font-size: 26rpx;">¥{{child.price}}</span>
-										</view>
-									</view>
-								</view>
-							</swiper-item>
-						</swiper>
-					</view>
-				</view>
-				<view class="recommend" id="scroll2">
-					<view class="title">{{i18n.Productdetails}}</view>
-					<view class="" style="margin-top: 32rpx;margin-bottom:28rpx">{{i18n.Specification}}</view>
-					<view class="specification">
-						<view class="item u-flex" style='margin-bottom:28rpx' v-for="(item,idx) in goodinfo.parameter"
-							:key="idx">
-							<view style='width:150rpx;'>{{item.name}}</view>
-							<text style='margin-left:58rpx'>{{item.value}}</text>
-						</view>
-					</view>
-					<view class="">
-						<image :src="goodinfo.image" style="width: 100%;height: 580rpx;" mode=""></image>
-					</view>
-				</view>
-				<view class="" style="height: 158rpx;"></view>
-				<view class="fix u-flex u-row-between">
-					<view class="u-flex" style="column-gap: 35rpx;">
-						<view class="u-flex" style="justify-content: center;flex-direction: column;">
-							<image src="../static/images/index/service.png" style='width:40rpx;height:40rpx' mode="">
-							</image>
-							<view class="ke">{{i18n.Customer}}</view>
-						</view>
-						<view class="u-flex" style="justify-content: center;flex-direction: column;" @click="shopping">
-							<image src="../static/cart1.png" style='width:40rpx;height:40rpx' mode=""></image>
-							<view class="ke">{{i18n.Shopping}}</view>
-						</view>
-						<view class="u-flex" style="justify-content: center;flex-direction: column;width:70rpx ;"
-							@click="fllow">
-							<image v-if='goodinfo.is_interest==1' src="../static/images/index/attention.png"
-								style='width:40rpx;height:40rpx' mode="">
-								<image v-if='goodinfo.is_interest==0' src="../static/images/index/bottom1.png"
-									style='width:40rpx;height:40rpx' mode="">
-								</image>
-								<view v-if='goodinfo.is_interest==1' class="ke">{{i18n.follow}}</view>
-								<view v-if='goodinfo.is_interest==0' class="ke" style="color: rgba(248, 50, 36, 1);">已关注
-								</view>
-						</view>
-					</view>
-					<view v-if="sku_info.stock_total==0" class="tongzhi" @click="inform">
-						{{i18n.notification}}
-					</view>
-					<view v-if="sku_info.stock_total!=0" class="join" @click="join(0)">加入购物车</view>
-					<view v-if="sku_info.stock_total!=0" class="pin" @click="join(1)">立即拼团</view>
-				</view>
-			</view>
-		</scroll-view>
-		<!-- 加入购物车 -->
-		<u-popup :round="10" :show="show">
-			<view style="padding:48rpx 28rpx;box-sizing: border-box;position: relative;">
-				<view class="u-flex">
-					<image :src="goodinfo.image" style="width: 192rpx;height: 192rpx;" mode=""></image>
-					<view class="" style="margin-left: 20rpx;">
-						<view class="">
-							<text class="read">¥</text>
-							<text class="read" style="font-size: 40rpx;"
-								v-if="goodinfo.is_discount==0">{{(Number(sku_info.discount_price*100)*Number(value*100))/10000 || (Number(goodinfo.discount_price*100) * Number(value*100))/10000}}</text>
-							<!-- <text class="read" v-if="goodinfo.is_discount==0">{{(goodinfo.discount_price * value).slice(-3)}}</text> -->
-							<text class="read" style="font-size: 40rpx;"
-								v-if="goodinfo.is_discount==1">{{(Number(sku_info.price*100)*Number(value*100))/10000|| (Number(goodinfo.price*100) * Number(value*100))/10000}}</text>
-							<!-- <text class="read" v-if="goodinfo.is_discount==1">{{(goodinfo.price * value).slice(-3)}}</text> -->
-							<!-- <text class="read" style="font-size: 40rpx;" >{{(Number(goodinfo.price) * Number(value)).toString()}}</text> -->
-						</view>
-						<text class="guige">已选：{{selectArr.join(',')||i18n.selection}}</text>
-					</view>
-				</view>
-				<view class="" style="position: absolute;top: 48rpx;right: 28rpx;" @click="show=false">
-					<u-icon name="close" @click="show==false" color="#000" size="28"></u-icon>
-				</view>
-				<view class="" v-for="(item,index) in goodinfo.sku">
-					<view class="title1" style="margin-top: 40rpx;margin-bottom: 32rpx;">
-						{{item.name}}
-					</view>
-					<view class="u-flex" style="column-gap: 18rpx;flex-wrap: wrap;">
-						<view class="" :class="selectArr[index]==child?'acttab':'tabs'"
-							v-for="(child,idx) in item.values" :key="idx" @click="actabs(index,child,item)">
-							{{child}}
-						</view>
-					</view>
-				</view>
-				<view class="u-flex u-row-between" style="margin-top: 30rpx;">
-					<text class="title1">数量</text>
-					<u-number-box v-model="value" @change="valChange"></u-number-box>
-				</view>
-				<view class="" style="height: 200rpx;"></view>
-				<view class="bottoma">
-					<view v-if="shopcar==0" class="btn" @click="joincart">
-						加入购物车
-					</view>
-					<view v-if="shopcar==1" class="btn" @click="order">
-						立即购买
-					</view>
-					<view v-if="shopcar==2" class="btn" @click="show = false">
-						确定
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="serve" :round="20">
-			<view style="padding:48rpx 24rpx;box-sizing: border-box;background-color: #FFF3E7;position: relative;border-radius: 20rpx 20rpx 0 0;">
-				<view class="u-flex" style="flex-direction: column;justify-content: center;">
-					<image src="../static/images/index/serve.png"
-						style="width: 138rpx;height: 34rpx;  " mode=""></image>
-					<text class="info">
-						售前售后 安心无忧购物
-					</text>
-				</view>
-				<view class="" style="position: absolute;top: 48rpx;right:24rpx;" @click="serve = false">
-					<u-icon name="close" style="width: 22rpx;height: 22rpx;"></u-icon>
-				</view>
-				<view class="contenta">
-					<view class="">
-						<view class="title">丢包丢件</view>
-						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
-					</view>
-					<view class="" style='margin-top:36rpx'>
-						<view class="title">丢包丢件</view>
-						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
-					</view>
-					<view class="" style='margin-top:36rpx'>
-						<view class="title">丢包丢件</view>
-						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
-					</view>
-				</view>
-				<view class="button" @click="serve = false">
-					{{i18n.know}}
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :round="10" :show="share" bgColor=' rgba(244, 244, 244, 1);'>
-			<view
-				style="padding:48rpx 24rpx;box-sizing: border-box;background-color: rgba(244, 244, 244, 1);border-radius: 10px 10px 0 0 ;">
-				<view class="u-flex u-row-between" style="">
-					<view class="" style="width: 28px;height: 28px;"></view>
-					<text class="info" style="font-size: 32rpx;">
-						{{i18n.shar}}
-					</text>
-					<image src="../static/images/index/bottom2.png" style="width: 40rpx;height: 40rpx;">
-				</view>
-				<!-- 				<view class="" style="position: absolute;top: 48rpx;right:24rpx;">
+        </view>
+        <view class="u-nav-slot u-flex" slot="right" style="display: flex">
+          <view class="" style="margin-left: 184rpx" @click="share = true">
+            <image
+              src="static/images/share.png"
+              style="width: 38rpx; height: 38rpx"
+              mode=""
+            ></image>
+          </view>
+          <view class="" style="width: 180rpx"></view>
+        </view>
+      </u-navbar>
+      <!-- 商品图片 -->
+      <view class="uni-margin-wrap" id="scroll0">
+        <swiper
+          class="swiper"
+          circular
+          :indicator-dots="false"
+          :autoplay="true"
+        >
+          <swiper-item v-if="goodinfo.video">
+            <video
+              style="width: 750rpx; height: 750rpx"
+              :src="goodinfo.video"
+            ></video>
+          </swiper-item>
+          <swiper-item
+            v-for="(item, idx) in goodinfo.images.split(',')"
+            :key="idx"
+          >
+            <image
+              :src="goodinfo.image"
+              style="width: 750rpx; height: 750rpx"
+              mode=""
+            ></image>
+          </swiper-item>
+        </swiper>
+      </view>
+      <view class="back">
+        <!-- 折扣 -->
+        <view class="discount">
+          <view class="top">
+            <text class="count" v-if="goodinfo.is_discount == 0">{{
+              i18n.Discounted
+            }}</text>
+            <text class="money">¥</text>
+            <text class="money" style="font-size: 48rpx">{{
+              goodinfo.is_discount == 0
+                ? goodinfo.discount_price.slice(0, -3)
+                : goodinfo.price.slice(0, -3)
+            }}</text>
+            <text class="money">{{
+              goodinfo.is_discount == 0
+                ? goodinfo.discount_price.slice(-3)
+                : goodinfo.price.slice(-3)
+            }}</text>
+            <text class="right" v-if="goodinfo.is_discount == 0"
+              >¥{{ goodinfo.price }}</text
+            >
+          </view>
+          <view class="bottom">
+            <text class="tabs">{{ i18n.sametype }}</text>
+            <view class="title">
+              <text
+                class="title"
+                selectable
+                @longpress="onLongPress"
+                v-if="language == 'zh-CN'"
+              >
+                {{ goodinfo.name_cn }}
+              </text>
+              <text
+                class="title"
+                selectable
+                @longpress="onLongPress"
+                v-if="language == 'en-US'"
+              >
+                {{ goodinfo.name_en }}
+              </text>
+              <text
+                class="title"
+                selectable
+                @longpress="onLongPress"
+                v-if="language == 'es-ES'"
+              >
+                {{ goodinfo.name_es }}
+              </text>
+              <text
+                class="title"
+                selectable
+                @longpress="onLongPress"
+                v-if="language == 'it-IT'"
+              >
+                {{ goodinfo.name_ita }}
+              </text>
+            </view>
+          </view>
+        </view>
+        <!-- 服务 -->
+        <view class="serve" style="margin-top: 20rpx">
+          <view class="top u-flex u-row-between" @click="sele">
+            <view class="u-flex">
+              <view class="change">{{ i18n.Sele }}</view>
+              <view class="" style="margin-left: 20rpx">
+                {{ selectArr.length > 0 ? selectArr.join(",") : i18n.Sele }}
+              </view>
+            </view>
+            <view class="">
+              <u-icon name="arrow-right" size="16"></u-icon>
+            </view>
+          </view>
+          <view
+            class="top u-flex u-row-between"
+            style="margin-top: 36rpx"
+            @click="serve = true"
+          >
+            <view class="u-flex">
+              <view class="change">{{ i18n.service }}</view>
+              <view class="" style="margin-left: 20rpx"
+                >正品保障 · 极速退款 · 7天无理由退</view
+              >
+            </view>
+            <view class="">
+              <u-icon name="arrow-right" size="16"></u-icon>
+            </view>
+          </view>
+        </view>
+        <!-- 评论 -->
+        <view class="comment" ref="targetPosition" id="scroll1">
+          <view class="u-flex u-row-between">
+            <text class="ping">{{ i18n.review }}</text>
+            <view class="u-flex" @click="tocomment">
+              <text class="strip"
+                >{{ total }}{{ i18n.article + i18n.review }}</text
+              >
+              <u-icon name="arrow-right" size="16"></u-icon>
+            </view>
+          </view>
+          <view class="" v-for="(item, idx) in commentlist" :key="idx">
+            <view class="uesr u-flex u-row-between" style="margin-top: 36rpx">
+              <view class="u-flex">
+                <image
+                  src="../static/images/logo.png"
+                  style="width: 52rpx; height: 52rpx"
+                  mode=""
+                >
+                </image>
+                <text class="name">{{ item.member.nickname }}</text>
+              </view>
+              <text class="strip">{{ item.created_at }}</text>
+            </view>
+            <view class="content">
+              {{ item.content }}
+            </view>
+            <view class="sku" style="margin-top: 16rpx">{{
+              item.sku_item.item
+            }}</view>
+          </view>
+        </view>
+        <!-- 店铺 -->
+        <view class="store u-flex u-row-between">
+          <view class="u-flex">
+            <image
+              :src="goodinfo.merchant.image"
+              style="width: 112rpx; height: 112rpx"
+              mode=""
+            ></image>
+            <view class="" style="margin-left: 20rpx">
+              <view class="title">{{ goodinfo.merchant.merchant_name }}</view>
+              <view class="redback u-flex">
+                <uni-rate
+                  network
+                  allow-half
+                  :readonly="true"
+                  active-color="red"
+                  color="rgba(255, 27, 0, 0.5)"
+                  :size="8"
+                  :value="5"
+                  v-model="rate"
+                />
+                <text style="margin-left: 8rpx">{{ rate }}</text>
+              </view>
+              <view class="" style="margin-top: 20rpx"></view>
+              <view class="u-flex" style="margin-top: 20rpx">
+                <text class="num">{{ i18n.Salesvolume }} 2384w+</text>
+                <view class="line"></view>
+                <!-- 评价总数 -->
+                <text class="num">{{ i18n.Salesvolume }} 2384w+</text>
+              </view>
+            </view>
+          </view>
+          <view class="goshop" @click="goshop">{{ i18n.stroll }}</view>
+        </view>
+        <!-- 推荐 -->
+        <view class="recommend">
+          <view class="title">
+            {{ i18n.Recommended }}
+          </view>
+          <view class="">
+            <swiper
+              style="height: 400rpx"
+              class="swiper"
+              circular
+              :indicator-dots="true"
+              :autoplay="true"
+            >
+              <swiper-item v-for="(parent, index) in swiptlist" :key="index">
+                <view class="u-flex swiper-item u-row-between">
+                  <view
+                    class=""
+                    v-for="(child, idx) in parent"
+                    @click="detail(child.id)"
+                    :key="idx"
+                  >
+                    <image
+                      :src="child.image"
+                      style="width: 214rpx; height: 214rpx"
+                      mode=""
+                    >
+                    </image>
+                    <view
+                      class="u-line-1"
+                      style="
+                        width: 214rpx;
+                        margin-top: 14rpx;
+                        font-style: normal;
+                        font-size: 26rpx;
+                      "
+                      v-if="language == 'zh-CN'"
+                    >
+                      {{ child.name_cn }}
+                    </view>
+                    <view
+                      class="u-line-1"
+                      style="
+                        width: 214rpx;
+                        margin-top: 14rpx;
+                        font-style: normal;
+                        font-size: 26rpx;
+                      "
+                      v-if="language == 'en-US'"
+                    >
+                      {{ child.name_en }}
+                    </view>
+                    <view
+                      class="u-line-1"
+                      style="
+                        width: 214rpx;
+                        margin-top: 14rpx;
+                        font-style: normal;
+                        font-size: 26rpx;
+                      "
+                      v-if="language == 'es-ES'"
+                    >
+                      {{ child.name_es }}
+                    </view>
+                    <view
+                      class="u-line-1"
+                      style="
+                        width: 214rpx;
+                        margin-top: 14rpx;
+                        font-style: normal;
+                        font-size: 26rpx;
+                      "
+                      v-if="language == 'it-IT'"
+                    >
+                      {{ child.name_ita }}
+                    </view>
+                    <view class="" style="margin-top: 12rpx">
+                      <span style="color: rgba(204, 51, 0, 1); font-size: 26rpx"
+                        >¥{{ child.price }}</span
+                      >
+                    </view>
+                  </view>
+                </view>
+              </swiper-item>
+            </swiper>
+          </view>
+        </view>
+        <view class="recommend" id="scroll2">
+          <view class="title">{{ i18n.Productdetails }}</view>
+          <view class="" style="margin-top: 32rpx; margin-bottom: 28rpx">{{
+            i18n.Specification
+          }}</view>
+          <view class="specification">
+            <view
+              class="item u-flex"
+              style="margin-bottom: 28rpx"
+              v-for="(item, idx) in goodinfo.parameter"
+              :key="idx"
+            >
+              <view style="width: 150rpx">{{ item.name }}</view>
+              <text style="margin-left: 58rpx">{{ item.value }}</text>
+            </view>
+          </view>
+          <view class="">
+            <image
+              :src="goodinfo.image"
+              style="width: 100%; height: 580rpx"
+              mode=""
+            ></image>
+          </view>
+        </view>
+        <view class="" style="height: 158rpx"></view>
+        <view class="fix u-flex u-row-between">
+          <view class="u-flex" style="column-gap: 35rpx">
+            <view
+              class="u-flex"
+              style="justify-content: center; flex-direction: column"
+            >
+              <image
+                src="../static/images/index/service.png"
+                style="width: 40rpx; height: 40rpx"
+                mode=""
+              >
+              </image>
+              <view class="ke">{{ i18n.Customer }}</view>
+            </view>
+            <view
+              class="u-flex"
+              style="justify-content: center; flex-direction: column"
+              @click="shopping"
+            >
+              <image
+                src="../static/cart1.png"
+                style="width: 40rpx; height: 40rpx"
+                mode=""
+              ></image>
+              <view class="ke">{{ i18n.Shopping }}</view>
+            </view>
+            <view
+              class="u-flex"
+              style="
+                justify-content: center;
+                flex-direction: column;
+                width: 70rpx;
+              "
+              @click="fllow"
+            >
+              <image
+                v-if="goodinfo.is_interest == 1"
+                src="../static/images/index/attention.png"
+                style="width: 40rpx; height: 40rpx"
+                mode=""
+              ></image>
+              <image
+                v-if="goodinfo.is_interest == 0"
+                src="../static/images/index/bottom1.png"
+                style="width: 40rpx; height: 40rpx"
+                mode=""
+              >
+              </image>
+              <view v-if="goodinfo.is_interest == 1" class="ke">{{
+                i18n.follow
+              }}</view>
+              <view
+                v-if="goodinfo.is_interest == 0"
+                class="ke"
+                style="color: rgba(248, 50, 36, 1)"
+                >已关注
+              </view>
+            </view>
+          </view>
+          <view
+            v-if="sku_info.stock_total == 0"
+            class="tongzhi"
+            @click="inform"
+          >
+            {{ i18n.notification }}
+          </view>
+          <view v-if="sku_info.stock_total != 0" class="join" @click="join(0)"
+            >加入购物车</view
+          >
+          <view v-if="sku_info.stock_total != 0" class="pin" @click="join(1)"
+            >立即拼团</view
+          >
+        </view>
+      </view>
+    </scroll-view>
+    <!-- 加入购物车 -->
+    <u-popup :round="10" :show="show">
+      <view
+        style="padding: 48rpx 28rpx; box-sizing: border-box; position: relative"
+      >
+        <view class="u-flex">
+          <image
+            :src="goodinfo.image"
+            style="width: 192rpx; height: 192rpx"
+            mode=""
+          ></image>
+          <view class="" style="margin-left: 20rpx">
+            <view class="">
+              <text class="read">¥</text>
+              <text
+                class="read"
+                style="font-size: 40rpx"
+                v-if="goodinfo.is_discount == 0"
+                >{{
+                  (Number(sku_info.discount_price * 100) *
+                    Number(value * 100)) /
+                    10000 ||
+                  (Number(goodinfo.discount_price * 100) *
+                    Number(value * 100)) /
+                    10000
+                }}</text
+              >
+              <!-- <text class="read" v-if="goodinfo.is_discount==0">{{(goodinfo.discount_price * value).slice(-3)}}</text> -->
+              <text
+                class="read"
+                style="font-size: 40rpx"
+                v-if="goodinfo.is_discount == 1"
+                >{{
+                  (Number(sku_info.price * 100) * Number(value * 100)) /
+                    10000 ||
+                  (Number(goodinfo.price * 100) * Number(value * 100)) / 10000
+                }}</text
+              >
+              <!-- <text class="read" v-if="goodinfo.is_discount==1">{{(goodinfo.price * value).slice(-3)}}</text> -->
+              <!-- <text class="read" style="font-size: 40rpx;" >{{(Number(goodinfo.price) * Number(value)).toString()}}</text> -->
+            </view>
+            <text class="guige"
+              >已选：{{ selectArr.join(",") || i18n.selection }}</text
+            >
+          </view>
+        </view>
+        <view
+          class=""
+          style="position: absolute; top: 48rpx; right: 28rpx"
+          @click="show = false"
+        >
+          <u-icon
+            name="close"
+            @click="show == false"
+            color="#000"
+            size="28"
+          ></u-icon>
+        </view>
+        <view class="" v-for="(item, index) in goodinfo.sku">
+          <view class="title1" style="margin-top: 40rpx; margin-bottom: 32rpx">
+            {{ item.name }}
+          </view>
+          <view class="u-flex" style="column-gap: 18rpx; flex-wrap: wrap">
+            <view
+              class=""
+              :class="selectArr[index] == child ? 'acttab' : 'tabs'"
+              v-for="(child, idx) in item.values"
+              :key="idx"
+              @click="actabs(index, child, item)"
+            >
+              {{ child }}
+            </view>
+          </view>
+        </view>
+        <view class="u-flex u-row-between" style="margin-top: 30rpx">
+          <text class="title1">数量</text>
+          <u-number-box v-model="value" @change="valChange"></u-number-box>
+        </view>
+        <view class="" style="height: 200rpx"></view>
+        <view class="bottoma">
+          <view v-if="shopcar == 0" class="btn" @click="joincart">
+            加入购物车
+          </view>
+          <view v-if="shopcar == 1" class="btn" @click="order"> 立即购买 </view>
+          <view v-if="shopcar == 2" class="btn" @click="show = false">
+            确定
+          </view>
+        </view>
+      </view>
+    </u-popup>
+    <u-popup :show="serve" :round="20">
+      <view
+        style="
+          padding: 48rpx 24rpx;
+          box-sizing: border-box;
+          background-color: #fff3e7;
+          position: relative;
+          border-radius: 20rpx 20rpx 0 0;
+        "
+      >
+        <view
+          class="u-flex"
+          style="flex-direction: column; justify-content: center"
+        >
+          <image
+            src="../static/images/index/serve.png"
+            style="width: 138rpx; height: 34rpx"
+            mode=""
+          ></image>
+          <text class="info"> 售前售后 安心无忧购物 </text>
+        </view>
+        <view
+          class=""
+          style="position: absolute; top: 48rpx; right: 24rpx"
+          @click="serve = false"
+        >
+          <u-icon name="close" style="width: 22rpx; height: 22rpx"></u-icon>
+        </view>
+        <view class="contenta">
+          <view class="">
+            <view class="title">丢包丢件</view>
+            <view class="content"
+              >快件如果在运输过程中出现损毁，将按照保价</view
+            >
+          </view>
+          <view class="" style="margin-top: 36rpx">
+            <view class="title">丢包丢件</view>
+            <view class="content"
+              >快件如果在运输过程中出现损毁，将按照保价</view
+            >
+          </view>
+          <view class="" style="margin-top: 36rpx">
+            <view class="title">丢包丢件</view>
+            <view class="content"
+              >快件如果在运输过程中出现损毁，将按照保价</view
+            >
+          </view>
+        </view>
+        <view class="button" @click="serve = false">
+          {{ i18n.know }}
+        </view>
+      </view>
+    </u-popup>
+    <u-popup :round="10" :show="share" bgColor=" rgba(244, 244, 244, 1);">
+      <view
+        style="
+          padding: 48rpx 24rpx;
+          box-sizing: border-box;
+          background-color: rgba(244, 244, 244, 1);
+          border-radius: 10px 10px 0 0;
+        "
+      >
+        <view class="u-flex u-row-between" style="">
+          <view class="" style="width: 28px; height: 28px"></view>
+          <text class="info" style="font-size: 32rpx">
+            {{ i18n.shar }}
+          </text>
+          <image
+            src="../static/images/index/bottom2.png"
+            style="width: 40rpx; height: 40rpx"
+          >
+          </image>
+        </view>
+        <!-- 				<view class="" style="position: absolute;top: 48rpx;right:24rpx;">
 					
 				</view> -->
-				<view class="u-flex u-row-between" style="margin-top: 82rpx;padding:  0 140rpx;">
-					<view class="">
-						<image src="../static/images/index/link.png" style="width: 108rpx;height: 108rpx;" mode="">
-						</image>
-						<view class="link">{{i18n.Copylink}}</view>
-					</view>
-					<view class="" @click="builder">
-						<image src="../static/images/index/image.png" style="width: 108rpx;height: 108rpx;" mode="">
-						</image>
-						<view class="link">{{i18n.Generatepicture}}</view>
-					</view>
-				</view>
-				<view class="button" @click="share = false" style="background: #fff;color: #555555;margin-top: 58rpx;">
-					{{i18n.Cancel}}
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="imagea" bgColor=' rgba(244, 244, 244, 0);' mode='center' :customStyle="{alignItems: 'center'}">
-			<view class="u-fle" style="display: flex; justify-content: flex-end;width: 100%;">
-				<u-icon name="close" @click="imagea==false" color="#fff" size="28"></u-icon>
-			</view>
-			<view
-				style="padding:48rpx 24rpx;box-sizing: border-box;background-color: rgba(255, 255, 255, 1);border-radius: 16rpx;width: 538rpx;">
-				<view class="" style="">
-					<image src="../static/images/index/bottom2.png" style="width: 490rpx;height: 490rpx;">
-				</view>
-				<view class="money">
-					<span>¥</span>
-					<span style="font-size: 36rpx;">258</span>
-					<span>00</span>
-				</view>
-				<view class="title">布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼</view>
-				<view class=""
-					style="display: flex;flex-direction: column;align-items: center;justify-content: center;margin-top: 44rpx;">
-					<image src="../static/images/logo.png" style="width: 132rpx;height: 132rpx;" mode=""></image>
-					<view class="view">长按识别查看</view>
-				</view>
-			</view>
-			<view class="button" style="width: 658rpx;">保存到相册</view>
-		</u-popup>
-	</view>
+        <view
+          class="u-flex u-row-between"
+          style="margin-top: 82rpx; padding: 0 140rpx"
+        >
+          <view class="">
+            <image
+              src="../static/images/index/link.png"
+              style="width: 108rpx; height: 108rpx"
+              mode=""
+            >
+            </image>
+            <view class="link">{{ i18n.Copylink }}</view>
+          </view>
+          <view class="" @click="builder">
+            <image
+              src="../static/images/index/image.png"
+              style="width: 108rpx; height: 108rpx"
+              mode=""
+            >
+            </image>
+            <view class="link">{{ i18n.Generatepicture }}</view>
+          </view>
+        </view>
+        <view
+          class="button"
+          @click="share = false"
+          style="background: #fff; color: #555555; margin-top: 58rpx"
+        >
+          {{ i18n.Cancel }}
+        </view>
+      </view>
+    </u-popup>
+    <u-popup
+      :show="imagea"
+      bgColor=" rgba(244, 244, 244, 0);"
+      mode="center"
+      :customStyle="{ alignItems: 'center' }"
+    >
+      <view
+        class="u-fle"
+        style="display: flex; justify-content: flex-end; width: 100%"
+      >
+        <u-icon
+          name="close"
+          @click="imagea == false"
+          color="#fff"
+          size="28"
+        ></u-icon>
+      </view>
+      <view
+        style="
+          padding: 48rpx 24rpx;
+          box-sizing: border-box;
+          background-color: rgba(255, 255, 255, 1);
+          border-radius: 16rpx;
+          width: 538rpx;
+        "
+      >
+        <view class="" style="">
+          <image
+            src="../static/images/index/bottom2.png"
+            style="width: 490rpx; height: 490rpx"
+          ></image>
+        </view>
+        <view class="money">
+          <span>¥</span>
+          <span style="font-size: 36rpx">258</span>
+          <span>00</span>
+        </view>
+        <view class="title">布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼</view>
+        <view
+          class=""
+          style="
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            margin-top: 44rpx;
+          "
+        >
+          <image
+            src="../static/images/logo.png"
+            style="width: 132rpx; height: 132rpx"
+            mode=""
+          ></image>
+          <view class="view">长按识别查看</view>
+        </view>
+      </view>
+      <view class="button" style="width: 658rpx">保存到相册</view>
+    </u-popup>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				toView: '',
-				imagea: false,
-				list1: [{
-					name: '商品',
-				}, {
-					name: '评价',
-				}, {
-					name: '详情'
-				}, ],
-				current: 0,
-				// 购物车
-				show: false,
-				//服务
-				serve: false,
-				//分享
-				share: false,
-				value: 1, //步进器的值
-				swiptlist: [], //推荐列表
-				actab: 0,
-				id: '', //商品id
-				language: '',
-				goodinfo: {}, //商品详情
-				duration: 0, //tabs选项
-				actidx: 0,
-				subIndex: [],
-				selectArr: [],
-				shopcar: '',
-				sku_info: {},
-				commentlist: [],
-				total: '',
-				rate: 5,
-			};
-		},
-		computed: {
-			i18n() {
-				return this.$t('index')
-			}
-		},
-		onLoad(options) {
-			this.id = options.id
-			this.comment()
-		},
-		onShow() {
-			if (uni.getStorageSync('language') != '') {
-				this.language = uni.getStorageSync('language')
-			}
-			this.detail(this.id)
-			this.recommend()
-		},
-		methods: {
-			//评论页面
-			tocomment() {
-				uni.navigateTo({
-					url: '/pageA/comment?id=' + this.goodinfo.merchant_goods_id
-				})
-			},
-			//关注
-			fllow() {
-				uni.$u.http.post('/api/interest/follow', {
-					interest_type: 0,
-					interest_id: this.goodinfo.merchant_goods_id
-				}).then((res) => {
-					if (res == 'ok1') {
-						this.$u.toast('取关成功')
-						this.detail(this.id)
-					} else {
-						this.$u.toast('关注成功')
-						this.detail(this.id)
-					}
-				}).catch(() => {
-
-				})
-			},
-			sele() {
-				this.shopcar = 2
-				this.show = true
-			},
-			//跳转到购物车
-			shopping() {
-				uni.switchTab({
-					url: "/pages/cart/cart"
-				})
-			},
-			//评论接口
-			comment() {
-				uni.$u.http.post('/api/goods/goods_comment', {
-					merchant_goods_id: this.goodinfo.merchant_goods_id,
-					page: 1,
-					limit: 2
-				}).then((res) => {
-					this.commentlist = res.data
-					this.total = res.total
-				}).catch(() => {
-
-				})
-			},
-			//商品推荐
-			recommend() {
-				uni.$u.http.post('/api/goods/recommend', {
-					keyword: '',
-				}).then((res) => {
-					this.swiptlist = res.reduce((a, b) => {
-						let lastIndex = a.length - 1
-						if (a[lastIndex].length < 3) {
-							a[lastIndex].push(b)
-						} else {
-							a.push([b])
-						}
-						return a
-					}, [
-						[]
-					])
-				}).catch(() => {
-
-				})
-			},
-			scrollToPosition(e) {
-				this.current = e.index
-				setTimeout(() => {
-					this.toView = 'scroll' + e.index
-				}, 200)
-
-			},
-			//逛逛
-			goshop() {
-				uni.navigateTo({
-					url: '/pageD/homepage/homepage'
-				})
-			},
-			detail(id) {
-				uni.$u.http.get('/api/goods/detail/' + id, ).then((res) => {
-					console.log(res);
-					this.goodinfo = res
-					this.comment()
-					this.rate = res.merchant.score
-				}).catch(() => {
-
-				})
-			},
-			// scrollToPosition() {
-			// 	console.log(111);
-			// 	// 使用$refs获取目标位置的DOM元素
-			// 	const targetElement = this.$refs.targetPosition;
-			// 	// 调用scrollToView方法滚动到目标位置
-			// 	this.$refs.scrollView.scrollToView('targetPosition');
-			// },
-			actabs(index, child, idx) {
-				// this.actidx = index
-				// this.actab = child
-				console.log(this.selectArr);
-				if (this.selectArr[index] != child) {
-					this.$set(this.selectArr, index, child);
-					this.$set(this.subIndex, index, idx);
-				} else {
-					this.$set(this.selectArr, index, '');
-					this.$set(this.subIndex, index, -1); //去掉选中颜色
-				}
-				this.goodinfo.sku_item.forEach(ite => {
-					console.log(ite.item);
-					console.log(this.selectArr.join(','));
-					if (ite.item == this.selectArr.join(',')) {
-						this.sku_info = ite
-					}
-				})
-				console.log(this.sku_info);
-			},
-			order() {
-				if (this.sku_info.stock_total != 0) {
-					uni.navigateTo({
-						url: '/pageA/order?sku=' + encodeURIComponent(JSON.stringify(this.sku_info)) + '&value=' +
-							this
-							.value + '&goodinfo=' + encodeURIComponent(JSON.stringify(this.goodinfo))
-					})
-				} else {
-					this.$u.toast('库存为0')
-					this.show = false
-				}
-				// console.log(JSON.stringify(this.sku_info));
-			},
-			//生成图片弹窗
-			builder() {
-				this.imagea = true
-				this.share = false
-			},
-			//加入购物车
-			joincart() {
-				this.show = false
-				if (this.sku_info.stock_total == 0) {
-					this.$u.toast('添加失败,库存为0')
-				} else {
-					uni.$u.http.post('/api/cart/save', {
-						goods_id: this.id, //63 是 String 商品id 
-						goods_num: this.value, //1 是 String 商品数量
-						sku_item_id: this.sku_info.id, //38 是 String 规格详情id
-						merchant_goods_id: this.goodinfo.merchant_goods_id, //38 是 String 团长商品id
-						belong: this.goodinfo.source, //是 String 商品归属 0 团长 1 平台自营 2 团长发布或者分享的平台自营商品、 供应链商品
-						share_merchant_id: '', //是 String 分享团长id
-					}).then((res) => {
-						this.$u.toast('添加成功')
-					}).catch(() => {
-
-					})
-				}
-			},
-			valChange(e) {
-				return e.value
-			},
-			navigateBack() {
-				uni.navigateBack()
-			},
-			join(index) {
-				this.show = true
-				this.shopcar = index
-			},
-			//通知
-			inform() {
-				uni.showToast({
-					title: this.i18n.shelves,
-					icon: 'none',
-					duration: 2000
-				});
-			},
-			//复制
-			onLongPress(e) {
-				// 获取长按的文本内容
-				let text = e.target.innerText;
-				console.log(e);
-				// 执行复制操作
-				uni.setClipboardData({
-					data: text,
-					success: () => {
-						uni.showToast({
-							title: this.i18n.Copiedpaste,
-							duration: 2000
-						});
-					},
-					fail: () => {
-						uni.showToast({
-							title: this.i18n.Replicationfailure,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				});
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      toView: "",
+      imagea: false,
+      list1: [
+        {
+          name: "商品",
+        },
+        {
+          name: "评价",
+        },
+        {
+          name: "详情",
+        },
+      ],
+      current: 0,
+      // 购物车
+      show: false,
+      //服务
+      serve: false,
+      //分享
+      share: false,
+      value: 1, //步进器的值
+      swiptlist: [], //推荐列表
+      actab: 0,
+      id: "", //商品id
+      language: "",
+      goodinfo: {}, //商品详情
+      duration: 0, //tabs选项
+      actidx: 0,
+      subIndex: [],
+      selectArr: [],
+      shopcar: "",
+      sku_info: {},
+      commentlist: [],
+      total: "",
+      rate: 5,
+    };
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  onLoad(options) {
+    this.id = options.id;
+    this.comment();
+  },
+  onShow() {
+    if (uni.getStorageSync("language") != "") {
+      this.language = uni.getStorageSync("language");
+    }
+    this.detail(this.id);
+    this.recommend();
+  },
+  methods: {
+    //评论页面
+    tocomment() {
+      uni.navigateTo({
+        url: "/pageA/comment?id=" + this.goodinfo.merchant_goods_id,
+      });
+    },
+    //关注
+    fllow() {
+      uni.$u.http
+        .post("/api/interest/follow", {
+          interest_type: 0,
+          interest_id: this.goodinfo.merchant_goods_id,
+        })
+        .then((res) => {
+          if (res == "ok1") {
+            this.$u.toast("取关成功");
+            this.detail(this.id);
+          } else {
+            this.$u.toast("关注成功");
+            this.detail(this.id);
+          }
+        })
+        .catch(() => {});
+    },
+    sele() {
+      this.shopcar = 2;
+      this.show = true;
+    },
+    //跳转到购物车
+    shopping() {
+      uni.switchTab({
+        url: "/pages/cart/cart",
+      });
+    },
+    //评论接口
+    comment() {
+      uni.$u.http
+        .post("/api/goods/goods_comment", {
+          merchant_goods_id: this.goodinfo.merchant_goods_id,
+          page: 1,
+          limit: 2,
+        })
+        .then((res) => {
+          this.commentlist = res.data;
+          this.total = res.total;
+        })
+        .catch(() => {});
+    },
+    //商品推荐
+    recommend() {
+      uni.$u.http
+        .post("/api/goods/recommend", {
+          keyword: "",
+        })
+        .then((res) => {
+          this.swiptlist = res.reduce(
+            (a, b) => {
+              let lastIndex = a.length - 1;
+              if (a[lastIndex].length < 3) {
+                a[lastIndex].push(b);
+              } else {
+                a.push([b]);
+              }
+              return a;
+            },
+            [[]]
+          );
+        })
+        .catch(() => {});
+    },
+    scrollToPosition(e) {
+      console.log(e);
+      this.current = e.index;
+      setTimeout(() => {
+        this.toView = "scroll" + e.index;
+      }, 200);
+    },
+    //逛逛
+    goshop() {
+      uni.navigateTo({
+        url: "/pageD/homepage/homepage",
+      });
+    },
+    detail(id) {
+      uni.$u.http
+        .get("/api/goods/detail/" + id)
+        .then((res) => {
+          console.log(res);
+          this.goodinfo = res;
+          this.comment();
+          this.rate = res.merchant.score;
+        })
+        .catch(() => {});
+    },
+    // scrollToPosition() {
+    // 	console.log(111);
+    // 	// 使用$refs获取目标位置的DOM元素
+    // 	const targetElement = this.$refs.targetPosition;
+    // 	// 调用scrollToView方法滚动到目标位置
+    // 	this.$refs.scrollView.scrollToView('targetPosition');
+    // },
+    actabs(index, child, idx) {
+      // this.actidx = index
+      // this.actab = child
+      console.log(this.selectArr);
+      if (this.selectArr[index] != child) {
+        this.$set(this.selectArr, index, child);
+        this.$set(this.subIndex, index, idx);
+      } else {
+        this.$set(this.selectArr, index, "");
+        this.$set(this.subIndex, index, -1); //去掉选中颜色
+      }
+      this.goodinfo.sku_item.forEach((ite) => {
+        console.log(ite.item);
+        console.log(this.selectArr.join(","));
+        if (ite.item == this.selectArr.join(",")) {
+          this.sku_info = ite;
+        }
+      });
+      console.log(this.sku_info);
+    },
+    order() {
+      if (this.sku_info.stock_total != 0) {
+        uni.navigateTo({
+          url:
+            "/pageA/order?sku=" +
+            encodeURIComponent(JSON.stringify(this.sku_info)) +
+            "&value=" +
+            this.value +
+            "&goodinfo=" +
+            encodeURIComponent(JSON.stringify(this.goodinfo)),
+        });
+      } else {
+        this.$u.toast("库存为0");
+        this.show = false;
+      }
+      // console.log(JSON.stringify(this.sku_info));
+    },
+    //生成图片弹窗
+    builder() {
+      this.imagea = true;
+      this.share = false;
+    },
+    //加入购物车
+    joincart() {
+      this.show = false;
+      if (this.sku_info.stock_total == 0) {
+        this.$u.toast("添加失败,库存为0");
+      } else {
+        uni.$u.http
+          .post("/api/cart/save", {
+            goods_id: this.id, //63 是 String 商品id
+            goods_num: this.value, //1 是 String 商品数量
+            sku_item_id: this.sku_info.id, //38 是 String 规格详情id
+            merchant_goods_id: this.goodinfo.merchant_goods_id, //38 是 String 团长商品id
+            belong: this.goodinfo.source, //是 String 商品归属 0 团长 1 平台自营 2 团长发布或者分享的平台自营商品、 供应链商品
+            share_merchant_id: "", //是 String 分享团长id
+          })
+          .then((res) => {
+            this.$u.toast("添加成功");
+          })
+          .catch(() => {});
+      }
+    },
+    valChange(e) {
+      return e.value;
+    },
+    navigateBack() {
+      uni.navigateBack();
+    },
+    join(index) {
+      this.show = true;
+      this.shopcar = index;
+    },
+    //通知
+    inform() {
+      uni.showToast({
+        title: this.i18n.shelves,
+        icon: "none",
+        duration: 2000,
+      });
+    },
+    //复制
+    onLongPress(e) {
+      // 获取长按的文本内容
+      let text = e.target.innerText;
+      console.log(e);
+      // 执行复制操作
+      uni.setClipboardData({
+        data: text,
+        success: () => {
+          uni.showToast({
+            title: this.i18n.Copiedpaste,
+            duration: 2000,
+          });
+        },
+        fail: () => {
+          uni.showToast({
+            title: this.i18n.Replicationfailure,
+            icon: "none",
+            duration: 2000,
+          });
+        },
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.redback {
-		background: rgba(255, 27, 0, 0.07);
-		border-radius: 12rpx;
-		padding: 6rpx 12rpx;
-		box-sizing: border-box;
-		font-family: HarmonyOS_Sans_Medium;
-		font-size: 16rpx;
-		color: #FF1515;
-		line-height: 22rpx;
-		text-align: left;
-		font-style: normal;
-		width: 200rpx;
-	}
-
-	.sku {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 20rpx;
-		color: #888888;
-		line-height: 28rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.acttab {
-		height: 68rpx;
-		padding: 14rpx 30rpx;
-		text-align: center;
-		box-sizing: border-box;
-		display: inline;
-		background: rgba(248, 50, 36, 0.06);
-		border-radius: 6rpx;
-		border: 2rpx solid #F83224;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #F83224;
-		line-height: 40rpx;
-	}
-
-	.read {
-		font-family: HarmonyOS_Sans_Medium;
-		font-size: 26rpx;
-		color: #F83224;
-		line-height: 36rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	// ::v-deep .u-popup__content{
-	// 	background-color: rgba(0,0,0,0) !important;
-	// }
-	.money {
-		font-family: HarmonyOS_Sans_Medium;
-		font-size: 20rpx;
-		color: #F83224;
-		line-height: 26rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.title {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #222222;
-		line-height: 40rpx;
-		text-align: left;
-		font-style: normal;
-		margin-top: 16rpx;
-	}
-
-	.view {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 20rpx;
-		color: #777777;
-		line-height: 28rpx;
-		text-align: left;
-		font-style: normal;
-		margin-top: 12rpx;
-	}
-
-	.actabs {
-		width: 116rpx;
-		height: 68rpx;
-		background: rgba(248, 50, 36, 0.06);
-		border-radius: 6rpx;
-		border: 2rpx solid #F83224;
-	}
-
-	.bottoma {
-		width: 750rpx;
-		height: 166rpx;
-		background: #FFFFFF;
-		padding: 16rpx 44rpx 0;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-
-		.btn {
-			width: 662rpx;
-			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;
-		}
-	}
-
-	.title1 {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 550;
-		font-size: 32rpx;
-		color: #222222;
-		line-height: 44rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.tabs {
-		// width: 276rpx;
-		height: 68rpx;
-		padding: 14rpx 30rpx;
-		text-align: center;
-		background: #F4F4F4;
-		border-radius: 6rpx;
-		box-sizing: border-box;
-		display: inline;
-		font-size: 28rpx;
-		border: 2rpx solid rgba(151, 151, 151, 0);
-		line-height: 40rpx;
-		// line-height: 68rpx;
-	}
-
-	.link {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #555555;
-		line-height: 40rpx;
-		text-align: left;
-		font-style: normal;
-		margin-top: 16rpx;
-	}
-
-	.tongzhi {
-		width: 422rpx;
-		height: 76rpx;
-		background: #FFB515;
-		border-radius: 40rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 28rpx;
-		color: #FFFFFF;
-		line-height: 76rpx;
-		text-align: center;
-		font-style: normal;
-	}
-
-	.info {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 20rpx;
-		color: #222222;
-		line-height: 28rpx;
-		text-align: left;
-		font-style: normal;
-		margin-top: 18rpx;
-	}
-
-	.button {
-		// width: 662rpx;
-		height: 88rpx;
-		background: #F83224;
-		border-radius: 44rpx;
-		margin-top: 24rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #FFFFFF;
-		line-height: 88rpx;
-		text-align: center;
-		font-style: normal;
-	}
-
-	.contenta {
-		width: 702rpx;
-		// height: 590rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx;
-		margin-top: 26rpx;
-		padding: 28rpx 24rpx;
-		box-sizing: border-box;
-
-		.title {
-			font-family: PingFangSC, PingFang SC;
-			font-weight: 500;
-			font-size: 30rpx;
-			color: #222222;
-			line-height: 42rpx;
-			text-align: left;
-			font-style: normal;
-		}
-
-		.content {
-			font-family: PingFangSC, PingFang SC;
-			font-weight: 400;
-			font-size: 26rpx;
-			color: rgba(34, 34, 34, 0.5);
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-top: 20rpx;
-		}
-	}
-
-	.back {
-		background-color: #F4F4F4;
-		padding: 20rpx;
-		box-sizing: border-box;
-
-		.guige {}
-
-		.fix {
-			width: 750rpx;
-			height: 158rpx;
-			background: #FFFFFF;
-			padding: 14rpx 28rpx;
-			box-sizing: border-box;
-			position: fixed;
-			bottom: 0;
-			left: 0;
-
-			.ke {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 20rpx;
-				color: #333333;
-				line-height: 28rpx;
-				text-align: left;
-				font-style: normal;
-			}
-
-			.join {
-				width: 208rpx;
-				height: 76rpx;
-				border-radius: 40rpx;
-				border: 1rpx solid #FF1515;
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #F83224;
-				line-height: 76rpx;
-				text-align: left;
-				font-style: normal;
-				text-align: center;
-			}
-
-			.pin {
-				width: 208rpx;
-				height: 76rpx;
-				background: #F83224;
-				border-radius: 40rpx;
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #FFFFFF;
-				line-height: 76rpx;
-				text-align: center;
-				font-style: normal;
-			}
-		}
-
-		// 规格
-		.specification {
-			width: 670rpx;
-			// height: 280rpx;
-			background: #F4F4F4;
-			padding: 24rpx 22rpx;
-			box-sizing: border-box;
-
-			view:last-of-type {
-				margin-bottom: 0rpx !important;
-			}
-
-			.item {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 26rpx;
-				color: #333333;
-				line-height: 36rpx;
-				text-align: left;
-				font-style: normal;
-			}
-		}
-
-		// 推荐
-		.recommend {
-			width: 710rpx;
-			// height: 476rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			padding: 24rpx 20rpx;
-			margin-top: 20rpx;
-			box-sizing: border-box;
-
-			.title {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 550;
-				font-size: 28rpx;
-				color: #222222;
-				line-height: 40rpx;
-				text-align: left;
-				font-style: normal;
-			}
-		}
-
-		//店铺
-		.store {
-			width: 710rpx;
-			height: 160rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			padding: 24rpx 20rpx;
-			box-sizing: border-box;
-			margin-top: 20rpx;
-
-			.line {
-				background: rgba(151, 151, 151, 1);
-				width: 4rpx;
-				height: 20rpx;
-				margin: 0 18rpx;
-			}
-
-			.num {
-				font-family: SFPro, SFPro;
-				font-weight: 400;
-				font-size: 20rpx;
-				color: #777777;
-				line-height: 24rpx;
-				text-align: left;
-				font-style: normal;
-			}
-
-			.goshop {
-				// width: 108rpx;
-				height: 52rpx;
-				border-radius: 26rpx;
-				border: 1rpx solid #FF1515;
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #F83224;
-				line-height: 52rpx;
-				text-align: center;
-				font-style: normal;
-				padding: 0 20rpx;
-				box-sizing: border-box;
-			}
-		}
-
-		// 评论
-		.comment {
-			width: 710rpx;
-			// height: 356rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			margin-top: 20rpx;
-			padding: 24rpx 20rpx;
-			box-sizing: border-box;
-
-			.content {
-				margin-top: 20rpx;
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 26rpx;
-				color: #444444;
-				line-height: 36rpx;
-				text-align: left;
-				font-style: normal;
-				max-height: 112rpx;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: wrap;
-				-webkit-line-clamp: 3
-			}
-
-			.name {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #222222;
-				line-height: 34rpx;
-				text-align: left;
-				font-style: normal;
-				margin-left: 16rpx;
-			}
-
-			.ping {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #222222;
-				line-height: 40rpx;
-				text-align: left;
-				font-style: normal;
-			}
-
-			.strip {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #444444;
-				line-height: 34rpx;
-				text-align: left;
-				font-style: normal;
-			}
-		}
-
-		//服务
-		.serve {
-			width: 710rpx;
-			height: 180rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			padding: 32rpx 20rpx;
-			box-sizing: border-box;
-
-			.top {
-				.change {
-					font-family: PingFangSC, PingFang SC;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #666666;
-					line-height: 40rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-		}
-
-		//折扣
-		.discount {
-			position: relative;
-			height: 312rpx;
-
-			.top {
-				width: 710rpx;
-				height: 124rpx;
-				background: linear-gradient(295deg, #FB6662 0%, #FD403B 100%);
-				border-radius: 16rpx 16rpx 0 0;
-				padding: 20rpx;
-				box-sizing: border-box;
-				line-height: 98rpx;
-
-				.count {
-					font-family: PingFangSC, PingFang SC;
-					font-weight: 400;
-					font-size: 20rpx;
-					color: #FFFFFF;
-					text-align: left;
-					font-style: normal;
-				}
-
-				.money {
-					font-size: 20rpx;
-					font-family: HarmonyOS_Sans_Medium;
-					font-size: 20rpx;
-					color: #FFFFFF;
-					text-align: left;
-					font-style: normal;
-					margin-left: 8rpx
-				}
-
-				.right {
-					font-family: HarmonyOS_Sans;
-					font-size: 24rpx;
-					color: #FFFFFF;
-					text-align: left;
-					font-style: normal;
-					text-decoration-line: line-through;
-					margin-left: 16rpx
-				}
-			}
-
-			.bottom {
-				width: 710rpx;
-				height: 208rpx;
-				background: #FFFFFF;
-				border-radius: 16rpx;
-				position: absolute;
-				top: 104rpx;
-				z-index: 2;
-				padding: 28rpx 20rpx;
-				box-sizing: border-box;
-
-				.title {
-					margin-top: 24rpx;
-					font-family: PingFangSC, PingFang SC;
-					font-weight: 550;
-					font-size: 32rpx;
-					color: #222222;
-					line-height: 44rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-
-			.tabs {
-				// width: 104rpx;
-				height: 40rpx;
-				background: rgba(255, 21, 21, 0.1);
-				border-radius: 4rpx;
-				padding: 4rpx 8rpx;
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 22rpx;
-				color: #FF1515;
-				line-height: 40rpx;
-				text-align: center;
-				font-style: normal;
-			}
-		}
-	}
-
-	// 轮播图
-	.uni-margin-wrap {
-		width: 750rpx;
-		width: 100%;
-
-		.swiper {
-			height: 750rpx;
-		}
-
-		.swiper-item {
-			display: block;
-			height: 300rpx;
-			line-height: 300rpx;
-			text-align: center;
-		}
-
-		.swiper-list {
-			margin-top: 40rpx;
-			margin-bottom: 0;
-		}
-
-		.uni-common-mt {
-			margin-top: 60rpx;
-			position: relative;
-		}
-
-		.info {
-			position: absolute;
-			right: 20rpx;
-		}
-
-		.uni-padding-wrap {
-			width: 550rpx;
-			padding: 0 100rpx;
-		}
-	}
-
-
-
-	::v-deep .u-popup__content data-v-17becaea {
-		align-items: center !important;
-	}
-</style>
+.redback {
+  background: rgba(255, 27, 0, 0.07);
+  border-radius: 12rpx;
+  padding: 6rpx 12rpx;
+  box-sizing: border-box;
+  font-family: HarmonyOS_Sans_Medium;
+  font-size: 16rpx;
+  color: #ff1515;
+  line-height: 22rpx;
+  text-align: left;
+  font-style: normal;
+  width: 200rpx;
+}
+
+.sku {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #888888;
+  line-height: 28rpx;
+  text-align: left;
+  font-style: normal;
+}
+
+.acttab {
+  height: 68rpx;
+  padding: 14rpx 30rpx;
+  text-align: center;
+  box-sizing: border-box;
+  display: inline;
+  background: rgba(248, 50, 36, 0.06);
+  border-radius: 6rpx;
+  border: 2rpx solid #f83224;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #f83224;
+  line-height: 40rpx;
+}
+
+.read {
+  font-family: HarmonyOS_Sans_Medium;
+  font-size: 26rpx;
+  color: #f83224;
+  line-height: 36rpx;
+  text-align: left;
+  font-style: normal;
+}
+
+// ::v-deep .u-popup__content{
+// 	background-color: rgba(0,0,0,0) !important;
+// }
+.money {
+  font-family: HarmonyOS_Sans_Medium;
+  font-size: 20rpx;
+  color: #f83224;
+  line-height: 26rpx;
+  text-align: left;
+  font-style: normal;
+}
+
+.title {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #222222;
+  line-height: 40rpx;
+  text-align: left;
+  font-style: normal;
+  margin-top: 16rpx;
+}
+
+.view {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #777777;
+  line-height: 28rpx;
+  text-align: left;
+  font-style: normal;
+  margin-top: 12rpx;
+}
+
+.actabs {
+  width: 116rpx;
+  height: 68rpx;
+  background: rgba(248, 50, 36, 0.06);
+  border-radius: 6rpx;
+  border: 2rpx solid #f83224;
+}
+
+.bottoma {
+  width: 750rpx;
+  height: 166rpx;
+  background: #ffffff;
+  padding: 16rpx 44rpx 0;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+
+  .btn {
+    width: 662rpx;
+    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;
+  }
+}
+
+.title1 {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 550;
+  font-size: 32rpx;
+  color: #222222;
+  line-height: 44rpx;
+  text-align: left;
+  font-style: normal;
+}
+
+.tabs {
+  // width: 276rpx;
+  height: 68rpx;
+  padding: 14rpx 30rpx;
+  text-align: center;
+  background: #f4f4f4;
+  border-radius: 6rpx;
+  box-sizing: border-box;
+  display: inline;
+  font-size: 28rpx;
+  border: 2rpx solid rgba(151, 151, 151, 0);
+  line-height: 40rpx;
+  // line-height: 68rpx;
+}
+
+.link {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #555555;
+  line-height: 40rpx;
+  text-align: left;
+  font-style: normal;
+  margin-top: 16rpx;
+}
+
+.tongzhi {
+  width: 422rpx;
+  height: 76rpx;
+  background: #ffb515;
+  border-radius: 40rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 28rpx;
+  color: #ffffff;
+  line-height: 76rpx;
+  text-align: center;
+  font-style: normal;
+}
+
+.info {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #222222;
+  line-height: 28rpx;
+  text-align: left;
+  font-style: normal;
+  margin-top: 18rpx;
+}
+
+.button {
+  // width: 662rpx;
+  height: 88rpx;
+  background: #f83224;
+  border-radius: 44rpx;
+  margin-top: 24rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #ffffff;
+  line-height: 88rpx;
+  text-align: center;
+  font-style: normal;
+}
+
+.contenta {
+  width: 702rpx;
+  // height: 590rpx;
+  background: #ffffff;
+  border-radius: 20rpx;
+  margin-top: 26rpx;
+  padding: 28rpx 24rpx;
+  box-sizing: border-box;
+
+  .title {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #222222;
+    line-height: 42rpx;
+    text-align: left;
+    font-style: normal;
+  }
+
+  .content {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 400;
+    font-size: 26rpx;
+    color: rgba(34, 34, 34, 0.5);
+    line-height: 36rpx;
+    text-align: left;
+    font-style: normal;
+    margin-top: 20rpx;
+  }
+}
+
+.back {
+  background-color: #f4f4f4;
+  padding: 20rpx;
+  box-sizing: border-box;
+
+  .guige {
+  }
+
+  .fix {
+    width: 750rpx;
+    height: 158rpx;
+    background: #ffffff;
+    padding: 14rpx 28rpx;
+    box-sizing: border-box;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+
+    .ke {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 20rpx;
+      color: #333333;
+      line-height: 28rpx;
+      text-align: left;
+      font-style: normal;
+    }
+
+    .join {
+      width: 208rpx;
+      height: 76rpx;
+      border-radius: 40rpx;
+      border: 1rpx solid #ff1515;
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 500;
+      font-size: 28rpx;
+      color: #f83224;
+      line-height: 76rpx;
+      text-align: left;
+      font-style: normal;
+      text-align: center;
+    }
+
+    .pin {
+      width: 208rpx;
+      height: 76rpx;
+      background: #f83224;
+      border-radius: 40rpx;
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 500;
+      font-size: 28rpx;
+      color: #ffffff;
+      line-height: 76rpx;
+      text-align: center;
+      font-style: normal;
+    }
+  }
+
+  // 规格
+  .specification {
+    width: 670rpx;
+    // height: 280rpx;
+    background: #f4f4f4;
+    padding: 24rpx 22rpx;
+    box-sizing: border-box;
+
+    view:last-of-type {
+      margin-bottom: 0rpx !important;
+    }
+
+    .item {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 26rpx;
+      color: #333333;
+      line-height: 36rpx;
+      text-align: left;
+      font-style: normal;
+    }
+  }
+
+  // 推荐
+  .recommend {
+    width: 710rpx;
+    // height: 476rpx;
+    background: #ffffff;
+    border-radius: 16rpx;
+    padding: 24rpx 20rpx;
+    margin-top: 20rpx;
+    box-sizing: border-box;
+
+    .title {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 550;
+      font-size: 28rpx;
+      color: #222222;
+      line-height: 40rpx;
+      text-align: left;
+      font-style: normal;
+    }
+  }
+
+  //店铺
+  .store {
+    width: 710rpx;
+    height: 160rpx;
+    background: #ffffff;
+    border-radius: 16rpx;
+    padding: 24rpx 20rpx;
+    box-sizing: border-box;
+    margin-top: 20rpx;
+
+    .line {
+      background: rgba(151, 151, 151, 1);
+      width: 4rpx;
+      height: 20rpx;
+      margin: 0 18rpx;
+    }
+
+    .num {
+      font-family: SFPro, SFPro;
+      font-weight: 400;
+      font-size: 20rpx;
+      color: #777777;
+      line-height: 24rpx;
+      text-align: left;
+      font-style: normal;
+    }
+
+    .goshop {
+      // width: 108rpx;
+      height: 52rpx;
+      border-radius: 26rpx;
+      border: 1rpx solid #ff1515;
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #f83224;
+      line-height: 52rpx;
+      text-align: center;
+      font-style: normal;
+      padding: 0 20rpx;
+      box-sizing: border-box;
+    }
+  }
+
+  // 评论
+  .comment {
+    width: 710rpx;
+    // height: 356rpx;
+    background: #ffffff;
+    border-radius: 16rpx;
+    margin-top: 20rpx;
+    padding: 24rpx 20rpx;
+    box-sizing: border-box;
+
+    .content {
+      margin-top: 20rpx;
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 26rpx;
+      color: #444444;
+      line-height: 36rpx;
+      text-align: left;
+      font-style: normal;
+      max-height: 112rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: wrap;
+      -webkit-line-clamp: 3;
+    }
+
+    .name {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #222222;
+      line-height: 34rpx;
+      text-align: left;
+      font-style: normal;
+      margin-left: 16rpx;
+    }
+
+    .ping {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 500;
+      font-size: 28rpx;
+      color: #222222;
+      line-height: 40rpx;
+      text-align: left;
+      font-style: normal;
+    }
+
+    .strip {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #444444;
+      line-height: 34rpx;
+      text-align: left;
+      font-style: normal;
+    }
+  }
+
+  //服务
+  .serve {
+    width: 710rpx;
+    height: 180rpx;
+    background: #ffffff;
+    border-radius: 16rpx;
+    padding: 32rpx 20rpx;
+    box-sizing: border-box;
+
+    .top {
+      .change {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666666;
+        line-height: 40rpx;
+        text-align: left;
+        font-style: normal;
+      }
+    }
+  }
+
+  //折扣
+  .discount {
+    position: relative;
+    height: 312rpx;
+
+    .top {
+      width: 710rpx;
+      height: 124rpx;
+      background: linear-gradient(295deg, #fb6662 0%, #fd403b 100%);
+      border-radius: 16rpx 16rpx 0 0;
+      padding: 20rpx;
+      box-sizing: border-box;
+      line-height: 98rpx;
+
+      .count {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 20rpx;
+        color: #ffffff;
+        text-align: left;
+        font-style: normal;
+      }
+
+      .money {
+        font-size: 20rpx;
+        font-family: HarmonyOS_Sans_Medium;
+        font-size: 20rpx;
+        color: #ffffff;
+        text-align: left;
+        font-style: normal;
+        margin-left: 8rpx;
+      }
+
+      .right {
+        font-family: HarmonyOS_Sans;
+        font-size: 24rpx;
+        color: #ffffff;
+        text-align: left;
+        font-style: normal;
+        text-decoration-line: line-through;
+        margin-left: 16rpx;
+      }
+    }
+
+    .bottom {
+      width: 710rpx;
+      height: 208rpx;
+      background: #ffffff;
+      border-radius: 16rpx;
+      position: absolute;
+      top: 104rpx;
+      z-index: 2;
+      padding: 28rpx 20rpx;
+      box-sizing: border-box;
+
+      .title {
+        margin-top: 24rpx;
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 550;
+        font-size: 32rpx;
+        color: #222222;
+        line-height: 44rpx;
+        text-align: left;
+        font-style: normal;
+      }
+    }
+
+    .tabs {
+      // width: 104rpx;
+      height: 40rpx;
+      background: rgba(255, 21, 21, 0.1);
+      border-radius: 4rpx;
+      padding: 4rpx 8rpx;
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 22rpx;
+      color: #ff1515;
+      line-height: 40rpx;
+      text-align: center;
+      font-style: normal;
+    }
+  }
+}
+
+// 轮播图
+.uni-margin-wrap {
+  width: 750rpx;
+  width: 100%;
+
+  .swiper {
+    height: 750rpx;
+  }
+
+  .swiper-item {
+    display: block;
+    height: 300rpx;
+    line-height: 300rpx;
+    text-align: center;
+  }
+
+  .swiper-list {
+    margin-top: 40rpx;
+    margin-bottom: 0;
+  }
+
+  .uni-common-mt {
+    margin-top: 60rpx;
+    position: relative;
+  }
+
+  .info {
+    position: absolute;
+    right: 20rpx;
+  }
+
+  .uni-padding-wrap {
+    width: 550rpx;
+    padding: 0 100rpx;
+  }
+}
+
+::v-deep .u-popup__content data-v-17becaea {
+  align-items: center !important;
+}
+</style>

pageC/mineFollow/mineFollow.vue

@@ -123,7 +123,7 @@ export default {
     },
     toDetail(item) {
       uni.navigateTo({
-        url: `/pageA/productdetails?id=${item.id}`,
+        url: `/pageA/productdetails?id=${item.merchant_goods.id}`,
       });
     },
     getInfoList(num) {

pageC/orderForm/component/orderInofrmation.vue

@@ -7,7 +7,7 @@
           src="https://tse4-mm.cn.bing.net/th/id/OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA?rs=1&pid=ImgDetMain"
           mode=""
         ></image>
-        <text>张三</text>
+        <text>{{ itemInfo.nickname }}</text>
         <image
           class="right-325"
           src="../../../static/mine/325.png"
@@ -116,16 +116,16 @@ export default {
         return "已取消";
       } else if (this.itemInfo.status == 3) {
         return "退款成功";
-      } else if (this.itemInfo.status == 4) {
+      } else if (this.itemInfo.status == "refunding") {
         return "退款中";
-      } else if (this.itemInfo.status == 5) {
+      } else if (this.itemInfo.status == "unreview") {
         return "拼团中";
       } else if (
         this.itemInfo.status == "paid" ||
         this.itemInfo.status == "merdelivered"
       ) {
         return "等待发货";
-      } else if (this.itemInfo.status == 7) {
+      } else if (this.itemInfo.status == "delivered") {
         return "等待收货";
       } else if (this.itemInfo.status == 8) {
         return "交易完成";

pageC/orderForm/orderForm.vue

@@ -59,9 +59,13 @@
           退款/售后
         </view>
       </view>
-      <view v-for="item in orderList" :key="item.status">
+      <view v-for="item in orderList" :key="item.id">
         <view v-if="follow != 7">
-          <OrderInofrmation :itemInfo="item" @toDetail="toDetail" />
+          <OrderInofrmation
+            :itemInfo="item"
+            @toDetail="toDetail"
+            @cancellationOrder="cancellationOrder"
+          />
         </view>
         <view v-else>
           <RefundCard
@@ -71,7 +75,7 @@
           />
         </view>
       </view>
-      <view v-for="item in orderList1" :key="item.id">
+      <!-- <view v-for="item in orderList1" :key="item.id">
         <view v-if="follow != 7">
           <OrderInofrmation
             :itemInfo="item"
@@ -86,7 +90,7 @@
             @toRefundDetail="toRefundDetail"
           />
         </view>
-      </view>
+      </view> -->
     </view>
   </view>
 </template>
@@ -164,8 +168,7 @@ export default {
       uni.$u.http
         .get(`/api/order/order_list?status=&page=1&limit=10`)
         .then((res) => {
-          console.log(res);
-          this.orderList1 = res.data;
+          this.orderList = res.data;
         });
     },
   },

pageD/afterSalesManage/afterSalesManage.vue

@@ -1,146 +1,176 @@
 <template>
-	<view>
-		<view class="top-tab">
-			<view :class="{commodity:follow==1}" class="tab" @click="tabSwitch(1)">
-				全部
-			</view>
-			<view :class="{commodity:follow==2}" class="tab" @click="tabSwitch(2)">
-				待退款
-			</view>
-			<view :class="{commodity:follow==3}" class="tab" @click="tabSwitch(3)">
-				平台介入
-			</view>
-			<view :class="{commodity:follow==4}" class="tab" @click="tabSwitch(4)">
-				已退款
-			</view>
-		</view>
-		<view class="center">
-			<view v-for="item in orderList" :key="item.status">
-				<DetailCard :itemInfo="item" @toDetail='toDetail' />
-			</view>
-		</view>
-	</view>
+  <view>
+    <view class="top-tab">
+      <view
+        :class="{ commodity: follow == 1 }"
+        class="tab"
+        @click="tabSwitch(1)"
+      >
+        全部
+      </view>
+      <view
+        :class="{ commodity: follow == 2 }"
+        class="tab"
+        @click="tabSwitch(2)"
+      >
+        待退款
+      </view>
+      <view
+        :class="{ commodity: follow == 3 }"
+        class="tab"
+        @click="tabSwitch(3)"
+      >
+        平台介入
+      </view>
+      <view
+        :class="{ commodity: follow == 4 }"
+        class="tab"
+        @click="tabSwitch(4)"
+      >
+        已退款
+      </view>
+    </view>
+    <view class="center">
+      <view v-for="item in orderList" :key="item.status">
+        <DetailCard :itemInfo="item" @toDetail="toDetail" />
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import DetailCard from './component/detailCard.vue'
-	export default {
-		components: {
-			DetailCard
-		},
-		data() {
-			return {
-
-				follow: 1,
-				orderList: [{
-						name: 'Trinity 自由比格',
-						status: 0,
-						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
-						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
-						orderDetail: 'OATLY噢麦力 咖啡大师…',
-						orderPrice: '29.90',
-						specifications: "咖啡大师燕麦奶250ml*6瓶",
-						num: 1,
-						payPrice: '141.00',
-						remark: '买家急用，仓库尽早发货'
-					},
-					{
-						name: 'Trinity 自由比格',
-						status: 1,
-						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
-						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
-						orderDetail: 'OATLY噢麦力 咖啡大师…',
-						orderPrice: '29.90',
-						specifications: "咖啡大师燕麦奶250ml*6瓶",
-						num: 1,
-						payPrice: '141.00',
-						remark: '买家急用，仓库尽早发货'
-					},
-					{
-						name: 'Trinity 自由比格',
-						status: 2,
-						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
-						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
-						orderDetail: 'OATLY噢麦力 咖啡大师…',
-						orderPrice: '29.90',
-						specifications: "咖啡大师燕麦奶250ml*6瓶",
-						num: 1,
-						payPrice: '141.00',
-						remark: '买家急用，仓库尽早发货'
-					},
-					{
-						name: 'Trinity 自由比格',
-						status: 3,
-						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
-						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
-						orderDetail: 'OATLY噢麦力 咖啡大师…',
-						orderPrice: '29.90',
-						specifications: "咖啡大师燕麦奶250ml*6瓶",
-						num: 1,
-						payPrice: '141.00',
-						remark: '买家急用，仓库尽早发货'
-					},
-				]
-			}
-		},
-		methods: {
-
-			tabSwitch(num) {
-				this.follow = num
-			},
-			toDetail(){
-				uni.navigateTo({
-					url:"/pageD/afterSalesDetail/afterSalesDetail"
-				})
-			}
-		},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title: "售后订单"
-			})
-		}
-	}
+import DetailCard from "./component/detailCard.vue";
+export default {
+  components: {
+    DetailCard,
+  },
+  data() {
+    return {
+      follow: 1,
+      orderList: [
+        {
+          name: "Trinity 自由比格",
+          status: 0,
+          headerImg:
+            "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+          orderImg:
+            "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+          orderDetail: "OATLY噢麦力 咖啡大师…",
+          orderPrice: "29.90",
+          specifications: "咖啡大师燕麦奶250ml*6瓶",
+          num: 1,
+          payPrice: "141.00",
+          remark: "买家急用，仓库尽早发货",
+        },
+        {
+          name: "Trinity 自由比格",
+          status: 1,
+          headerImg:
+            "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+          orderImg:
+            "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+          orderDetail: "OATLY噢麦力 咖啡大师…",
+          orderPrice: "29.90",
+          specifications: "咖啡大师燕麦奶250ml*6瓶",
+          num: 1,
+          payPrice: "141.00",
+          remark: "买家急用，仓库尽早发货",
+        },
+        {
+          name: "Trinity 自由比格",
+          status: 2,
+          headerImg:
+            "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+          orderImg:
+            "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+          orderDetail: "OATLY噢麦力 咖啡大师…",
+          orderPrice: "29.90",
+          specifications: "咖啡大师燕麦奶250ml*6瓶",
+          num: 1,
+          payPrice: "141.00",
+          remark: "买家急用，仓库尽早发货",
+        },
+        {
+          name: "Trinity 自由比格",
+          status: 3,
+          headerImg:
+            "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+          orderImg:
+            "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+          orderDetail: "OATLY噢麦力 咖啡大师…",
+          orderPrice: "29.90",
+          specifications: "咖啡大师燕麦奶250ml*6瓶",
+          num: 1,
+          payPrice: "141.00",
+          remark: "买家急用，仓库尽早发货",
+        },
+      ],
+    };
+  },
+  methods: {
+    tabSwitch(num) {
+      this.follow = num;
+    },
+    toDetail() {
+      uni.navigateTo({
+        url: "/pageD/afterSalesDetail/afterSalesDetail",
+      });
+    },
+    getOrderList() {
+      uni.$u.http.get(`/api/order/refund_order`).then((res) => {
+        console.log(res);
+        // this.orderList = res.data;
+      });
+    },
+  },
+  mounted() {
+    this.getOrderList();
+    uni.setNavigationBarTitle({
+      title: "售后订单",
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.top-tab {
-		display: flex;
-		justify-content: space-around;
-		overflow-y: auto;
-		padding-bottom: 10rpx;
-		// flex-shrink: 1;
-		// width: 100vw;
-		background-color: #fff;
+.top-tab {
+  display: flex;
+  justify-content: space-around;
+  overflow-y: auto;
+  padding-bottom: 10rpx;
+  // flex-shrink: 1;
+  // width: 100vw;
+  background-color: #fff;
 
-		.tab {
-			margin-right: 40rpx;
-			font-size: 26rpx;
-			color: rgba(34, 34, 34, .8);
-			flex-shrink: 0;
-			height: 44rpx;
-			display: flex;
-			align-items: flex-end;
-		}
+  .tab {
+    margin-right: 40rpx;
+    font-size: 26rpx;
+    color: rgba(34, 34, 34, 0.8);
+    flex-shrink: 0;
+    height: 44rpx;
+    display: flex;
+    align-items: flex-end;
+  }
 
-		.commodity {
-			position: relative;
-			font-weight: 600;
-			font-size: 32rpx;
-		}
+  .commodity {
+    position: relative;
+    font-weight: 600;
+    font-size: 32rpx;
+  }
 
-		.commodity::before {
-			content: '';
-			display: block;
-			height: 8rpx;
-			width: 100%;
-			background: linear-gradient(to right, #f83224, #fff);
-			position: absolute;
-			bottom: 5rpx;
-			opacity: 0.8;
-		}
-	}
+  .commodity::before {
+    content: "";
+    display: block;
+    height: 8rpx;
+    width: 100%;
+    background: linear-gradient(to right, #f83224, #fff);
+    position: absolute;
+    bottom: 5rpx;
+    opacity: 0.8;
+  }
+}
 
-	.center {
-		padding: 20rpx 24rpx;
-	}
-</style>
+.center {
+  padding: 20rpx 24rpx;
+}
+</style>

pageD/afterSalesManage/component/detailCard.vue

@@ -1,234 +1,243 @@
 <template>
-	<view class="card" @click="$emit('toDetail')">
-		<view class="user-name">
-			<view class="name">
-				<image class="header-img"
-					src="https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2"
-					mode=""></image>
-				<text>Trinity 自由比格</text>
-			</view>
-			<text class="order-status">{{deliveryStatus}}</text>
-		</view>
-		<view class="order-detail" >
-			<view class="detail">
-				<image class="order-img"
-					src="https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif"
-					mode=""></image>
-				<view class="detail-right">
-					<view class="title-price">
-						<view class="title">
-							OATLY噢麦力 咖啡大师…
-						</view>
-						<view class="price">
-							<text style="font-size: 20rpx;">￥</text>
-							<text>133</text>.
-							<text style="font-size: 20rpx;">22</text>
-						</view>
-					</view>
-					<view class="specifications">
-						<view class="title">
-							咖啡大师燕麦奶250ml*6瓶
-						</view>
-						<text>x1</text>
-					</view>
-				</view>
-			</view>
-			<view class="price-detail">
-				<text style="color: #222;font-size: 24rpx;">{{"共1件商品"+"&nbsp;"}}</text>
-				<text style="font-size: 28rpx;">买家实付</text>
-				<view class="price">
-					<text style="font-size: 20rpx;">￥</text>
-					<text>133</text>.
-					<text style="font-size: 20rpx;">22</text>
-				</view>
-			</view>
-		</view>
-		<view class="btn-list">
-			<button disabled class="btn-2" v-if="itemInfo.status == 0 ||itemInfo.status == 1">平台介入</button>
-			<button class="btn-1" v-if="itemInfo.status == 0 ||itemInfo.status == 1">拒绝申请</button>
-			<button class="btn-3" v-if="itemInfo.status == 0 ||itemInfo.status == 1">同意退款</button>
-			<button class="btn-2" v-if="itemInfo.status == 3">删除</button>
-			<button class="btn-2" v-if="itemInfo.status == 3">查看详情</button>
-		</view>
-	</view>
+  <view class="card" @click="$emit('toDetail')">
+    <view class="user-name">
+      <view class="name">
+        <image
+          class="header-img"
+          src="https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2"
+          mode=""
+        ></image>
+        <!-- {{ itemInfo.order.nickname }} -->
+        <text>张三</text>
+      </view>
+      <text class="order-status">{{ deliveryStatus }}</text>
+    </view>
+    <view class="order-detail">
+      <view class="detail">
+        <image
+          class="order-img"
+          src="https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif"
+          mode=""
+        ></image>
+        <view class="detail-right">
+          <view class="title-price">
+            <view class="title"> OATLY噢麦力 咖啡大师… </view>
+            <view class="price">
+              <text style="font-size: 20rpx">￥</text>
+              <text>133</text>.
+              <text style="font-size: 20rpx">22</text>
+            </view>
+          </view>
+          <view class="specifications">
+            <view class="title"> 咖啡大师燕麦奶250ml*6瓶 </view>
+            <text>x1</text>
+          </view>
+        </view>
+      </view>
+      <view class="price-detail">
+        <text style="color: #222; font-size: 24rpx">{{
+          "共1件商品" + "&nbsp;"
+        }}</text>
+        <text style="font-size: 28rpx">买家实付</text>
+        <view class="price">
+          <text style="font-size: 20rpx">￥</text>
+          <text>133</text>.
+          <text style="font-size: 20rpx">22</text>
+        </view>
+      </view>
+    </view>
+    <view class="btn-list">
+      <button
+        disabled
+        class="btn-2"
+        v-if="itemInfo.status == 0 || itemInfo.status == 1"
+      >
+        平台介入
+      </button>
+      <button class="btn-1" v-if="itemInfo.status == 0 || itemInfo.status == 1">
+        拒绝申请
+      </button>
+      <button class="btn-3" v-if="itemInfo.status == 0 || itemInfo.status == 1">
+        同意退款
+      </button>
+      <button class="btn-2" v-if="itemInfo.status == 3">删除</button>
+      <button class="btn-2" v-if="itemInfo.status == 3">查看详情</button>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		props: {
-			itemInfo: {
-				typeof: Object,
-				default: {}
-			}
-		},
-		computed: {
-			model() {
-				if (this.itemInfo.status == 0) {
-					return 'filter: blur(5px);'
-				}
-			},
-			deliveryStatus() {
-				if (this.itemInfo.status == 0) {
-					return '待退款'
-				} else if (this.itemInfo.status == 1) {
-					return '平台介入'
-				}else if (this.itemInfo.status == 2) {
-					return '拒绝退款'
-				}else if (this.itemInfo.status == 3) {
-					return '已退款'
-				}
-			}
-		},
-		data() {
-			return {}
-		}
-	}
+export default {
+  props: {
+    itemInfo: {
+      typeof: Object,
+      default: {},
+    },
+  },
+  computed: {
+    model() {
+      if (this.itemInfo.status == 0) {
+        return "filter: blur(5px);";
+      }
+    },
+    deliveryStatus() {
+      if (this.itemInfo.status == "refunding") {
+        return "待退款";
+      } else if (this.itemInfo.status == 1) {
+        return "平台介入";
+      } else if (this.itemInfo.status == 2) {
+        return "拒绝退款";
+      } else if (this.itemInfo.status == "refund") {
+        return "已退款";
+      }
+    },
+  },
+  data() {
+    return {};
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.card {
-		background-color: #fff;
-		border-radius: 16rpx;
-		padding: 0 20rpx;
-		padding-bottom: 20rpx;
-		margin-bottom: 20rpx;
-
-		.user-name {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			height: 84rpx;
-			border-bottom: 2rpx solid rgba(151, 151, 151, .2);
-
-			.name {
-				display: flex;
-				align-items: center;
-				font-size: 24rpx;
-				color: #333;
-
-				.header-img {
-					width: 40rpx;
-					height: 40rpx;
-					border-radius: 50%;
-					margin-right: 12rpx
-				}
-			}
-
-			.order-status {
-				font-size: 24rpx;
-				color: #f83224;
-			}
-		}
-
-		.order-detail {
-			margin-top: 22rpx;
-			position: relative;
-
-
-
-			.detail {
-				display: flex;
-
-				.order-img {
-					width: 180rpx;
-					height: 180rpx;
-					border-radius: 10rpx;
-					margin-right: 20rpx;
-				}
-
-				.detail-right {
-					width: 70%;
-
-					.title-price {
-						display: flex;
-						font-size: 28rpx;
-						justify-content: space-between;
-						align-items: center;
-
-						.title {
-							width: 330rpx;
-							overflow: hidden;
-							white-space: nowrap;
-							text-overflow: ellipsis;
-						}
-					}
-
-					.specifications {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-						font-size: 28rpx;
-						color: #777;
-						margin-top: 10rpx;
-
-						.title {
-							width: 330rpx;
-							overflow: hidden;
-							white-space: nowrap;
-							text-overflow: ellipsis;
-						}
-					}
-				}
-			}
-		}
-
-		.price-detail {
-			display: flex;
-			justify-content: flex-end;
-			align-items: flex-end;
-			margin-top: 20rpx;
-
-			.price {
-				font-weight: 600;
-			}
-		}
-
-		.remarks {
-			display: flex;
-			font-size: 28rpx;
-			background-color: #f4f4f4;
-			border-radius: 10rpx;
-			padding: 14rpx 20rpx;
-			margin-top: 20rpx;
-		}
-
-		.btn-list {
-			display: flex;
-			justify-content: flex-end;
-			margin-top: 30rpx;
-
-			.btn-1 {
-				font-size: 28rpx;
-				color: #f83224;
-				border: 2rpx solid #f83224;
-				background-color: #fff;
-				margin: 0;
-				border-radius: 34rpx;
-				min-width: 162rpx;
-				margin-left: 20rpx;
-			}
-
-			.btn-2 {
-				font-size: 28rpx;
-				color: #222;
-				border: 2rpx solid #979797;
-				background-color: #fff;
-				margin: 0;
-				border-radius: 34rpx;
-				min-width: 162rpx;
-				margin-left: 20rpx;
-
-			}
-			.btn-3 {
-				font-size: 28rpx;
-				color: #fff;
-				background-color: #f83224;
-				margin: 0;
-				border-radius: 34rpx;
-				min-width: 162rpx;
-				margin-left: 20rpx;
-
-			}
-		}
-	}
-</style>
+.card {
+  background-color: #fff;
+  border-radius: 16rpx;
+  padding: 0 20rpx;
+  padding-bottom: 20rpx;
+  margin-bottom: 20rpx;
+
+  .user-name {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 84rpx;
+    border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
+
+    .name {
+      display: flex;
+      align-items: center;
+      font-size: 24rpx;
+      color: #333;
+
+      .header-img {
+        width: 40rpx;
+        height: 40rpx;
+        border-radius: 50%;
+        margin-right: 12rpx;
+      }
+    }
+
+    .order-status {
+      font-size: 24rpx;
+      color: #f83224;
+    }
+  }
+
+  .order-detail {
+    margin-top: 22rpx;
+    position: relative;
+
+    .detail {
+      display: flex;
+
+      .order-img {
+        width: 180rpx;
+        height: 180rpx;
+        border-radius: 10rpx;
+        margin-right: 20rpx;
+      }
+
+      .detail-right {
+        width: 70%;
+
+        .title-price {
+          display: flex;
+          font-size: 28rpx;
+          justify-content: space-between;
+          align-items: center;
+
+          .title {
+            width: 330rpx;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+        }
+
+        .specifications {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          font-size: 28rpx;
+          color: #777;
+          margin-top: 10rpx;
+
+          .title {
+            width: 330rpx;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+        }
+      }
+    }
+  }
+
+  .price-detail {
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+    margin-top: 20rpx;
+
+    .price {
+      font-weight: 600;
+    }
+  }
+
+  .remarks {
+    display: flex;
+    font-size: 28rpx;
+    background-color: #f4f4f4;
+    border-radius: 10rpx;
+    padding: 14rpx 20rpx;
+    margin-top: 20rpx;
+  }
+
+  .btn-list {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 30rpx;
+
+    .btn-1 {
+      font-size: 28rpx;
+      color: #f83224;
+      border: 2rpx solid #f83224;
+      background-color: #fff;
+      margin: 0;
+      border-radius: 34rpx;
+      min-width: 162rpx;
+      margin-left: 20rpx;
+    }
+
+    .btn-2 {
+      font-size: 28rpx;
+      color: #222;
+      border: 2rpx solid #979797;
+      background-color: #fff;
+      margin: 0;
+      border-radius: 34rpx;
+      min-width: 162rpx;
+      margin-left: 20rpx;
+    }
+    .btn-3 {
+      font-size: 28rpx;
+      color: #fff;
+      background-color: #f83224;
+      margin: 0;
+      border-radius: 34rpx;
+      min-width: 162rpx;
+      margin-left: 20rpx;
+    }
+  }
+}
+</style>

pageD/commodityManage/commodityManage.vue

@@ -4,10 +4,12 @@
     <view class="top-tab-search" v-if="!batch">
       <view class="search">
         <u--input
+          v-model="keywords"
           placeholder="搜索商品名称"
           shape="circle"
           prefixIcon="search"
           prefixIconStyle="font-size: 22px;color: #909399"
+          @change="search"
         ></u--input>
         <view class="screen" @click="openPopup">
           筛选
@@ -21,23 +23,23 @@
       <view class="tab">
         <view class="top-tab">
           <view
-            :class="{ commodity: follow == 1 }"
+            :class="{ commodity: follow == '' }"
             class="tab"
-            @click="tabSwitch(1)"
+            @click="tabSwitch('')"
           >
             全部
           </view>
           <view
-            :class="{ commodity: follow == 2 }"
+            :class="{ commodity: follow == 'normal' }"
             class="tab"
-            @click="tabSwitch(2)"
+            @click="tabSwitch('normal')"
           >
             已上架
           </view>
           <view
-            :class="{ commodity: follow == 3 }"
+            :class="{ commodity: follow == 'down' }"
             class="tab"
-            @click="tabSwitch(3)"
+            @click="tabSwitch('down')"
           >
             已下架
           </view>
@@ -48,42 +50,58 @@
 
     <!-- 内容 -->
     <view class="page">
-      <view class="list">
-        <view class="radio" v-if="batch">
-          <radio
-            @click="value = !value"
-            :checked="value"
-            style="transform: scale(0.7)"
-            color="#f83224"
-            activeBackgroundColor="#f83224"
-            backgroundColor="#f83224"
-          ></radio>
+      <u-checkbox-group
+        v-model="selectedGoods"
+        placement="column"
+        @change="checkboxChange"
+      >
+        <view v-for="item in goodsList" :key="item.id">
+          <view class="list">
+            <view class="radio" v-if="batch">
+              <u-checkbox
+                :name="item.id"
+                shape="circle"
+                color="#f83224"
+                activeColor="#f83224"
+                :disabled="item.goods.status == 'down'"
+              >
+              </u-checkbox>
+            </view>
+            <GoodsInformation
+              :batch="batch"
+              productAndCommodity="commodity"
+              @openDiscountsPopup="openDiscountsPopup"
+              :status="status"
+              :itemInfo="item"
+              @toDetail="toDetail"
+            />
+          </view>
         </view>
-        <GoodsInformation
-          :batch="batch"
-          productAndCommodity="commodity"
-          @openDiscountsPopup="openDiscountsPopup"
-          :status="status"
-          @toDetail="toDetail"
-        />
-      </view>
+      </u-checkbox-group>
     </view>
     <view class="footer" v-if="!batch">
       <view class="batch" @click="batchDiscount"> 批量打折 </view>
-      <button class="btn-1">上架平台商品</button>
+      <!-- <button class="btn-1">上架平台商品</button> -->
     </view>
     <view class="footer" v-else>
-      <view class="batch" @click="batchDiscount">
+      <view class="batch" @click="allSelect">
         <radio
-          @click="value = !value"
           :checked="value"
           style="transform: scale(0.7)"
           color="#f83224"
           activeBackgroundColor="#f83224"
-          backgroundColor="#f83224"
         ></radio>
         全选
       </view>
+      <view
+        style="
+          font-size: 26rpx;
+          margin-left: 20rpx;
+          color: rgba(54, 54, 54, 0.5);
+        "
+        @click="cancelDiscount"
+        >取消打折</view
+      >
       <button class="btn" @click="wantDiscount">我要打折</button>
     </view>
     <!-- 筛选弹窗 -->
@@ -93,18 +111,24 @@
     <!-- 打折弹窗 -->
     <DiscountsPopup
       :show="discountsShow"
-      :goodsInformation="goodsInformation"
+      :selectGoodsInformation="selectGoodsInformation"
       @close="closeDiscountsPopup"
     />
     <!-- 打折弹窗 -->
 
     <!-- 批量打折 -->
-    <BatchDiscountPopup :show="batchPopup" @close="closeDiscountsPopup" />
+    <BatchDiscountPopup
+      :show="batchPopup"
+      @close="closeDiscountsPopup"
+      :selectGoodsInformation="selectGoodsInformation"
+    />
+
+    <u-toast ref="uToast"></u-toast>
   </view>
 </template>
 
 <script>
-import GoodsInformation from "../components/goodsInformation.vue";
+import GoodsInformation from "./component/goodsInformation.vue";
 import ScreenPopup from "./component/screenPopup.vue";
 import DiscountsPopup from "./component/discountsPopup.vue";
 import BatchDiscountPopup from "./component/batchDiscountPopup.vue";
@@ -117,56 +141,155 @@ export default {
   },
   data() {
     return {
-      follow: 1,
+      follow: "",
       status: "1",
       show: false,
       discountsShow: false,
-      goodsInformation: {},
+      selectGoodsInformation: {},
       batch: false,
       value: false,
       batchPopup: false,
+      goodsList: [],
+      keywords: "", //搜索关键字
+      source: "",
+      selectedGoods: [],
     };
   },
   computed: {
     i18n() {
       return this.$t("index");
     },
+    //可选的商品数量，去掉下架的商品
+    goodsLength() {
+      let num = 0;
+      this.goodsList.map((item) => {
+        if (item.goods.status != "down") {
+          num++;
+        }
+      });
+      return num;
+    },
+  },
+  watch: {
+    selectedGoods(newVal) {
+      if (this.goodsLength == newVal.length) {
+        this.value = true;
+      } else {
+        this.value = false;
+      }
+    },
   },
   methods: {
     //切换横向tab栏
     tabSwitch(num) {
       this.follow = num;
+      this.getCommodityList(num);
+    },
+    checkboxChange(e) {
+      console.log(e);
+    },
+    //搜索
+    search(e) {
+      this.getCommodityList();
     },
     //打开筛选弹窗
     openPopup() {
       this.show = true;
     },
     //关闭筛选弹窗
-    close(num) {
+    close(data) {
       this.show = false;
-      this.follow = num;
+      if (data) {
+        this.keywords = data.keywords;
+        this.source = data.source;
+        this.getCommodityList(data.status);
+      } else {
+        this.keywords = "";
+        this.source = "";
+        this.getCommodityList();
+      }
+      // this.follow = num;
+    },
+    //全选
+    allSelect() {
+      //判断是否已经全选
+      if (this.selectedGoods.length == this.goodsLength) {
+        this.selectedGoods = [];
+      } else {
+        this.goodsList.map((item) => {
+          if (
+            this.selectedGoods.indexOf(item.id) == -1 &&
+            item.goods.status != "down"
+          ) {
+            this.selectedGoods.push(item.id);
+          }
+        });
+      }
     },
     //批量打折
     batchDiscount() {
       this.batch = !this.batch;
-
       uni.setNavigationBarTitle({
         title: "批量打折",
       });
     },
+    cancelDiscount() {
+      this.batch = false;
+      uni.setNavigationBarTitle({
+        title: "商品管理",
+      });
+      this.selectedGoods = [];
+    },
     //打开我要打折窗口
     wantDiscount() {
+      if (this.selectedGoods == 0) {
+        this.$refs.uToast.show({
+          type: "default",
+          title: "默认主题",
+          message: "请选择至少一个商品",
+        });
+        return;
+      }
       this.batchPopup = true;
     },
 
     //关闭折扣弹窗
-    closeDiscountsPopup() {
-      this.discountsShow = false;
-      this.batchPopup = false;
+    closeDiscountsPopup(value) {
+      //判断是批量打折还是单个打折
+      if (this.batchPopup) {
+        this.batchPopup = false;
+        if (value) {
+          uni.$u.http
+            //将选中商品的id使用","拼接
+            .post(`/api/goods/discount`, {
+              merchant_goods_id: this.selectedGoods.join(","),
+              mer_discount: value,
+            })
+            .then((res) => {
+              this.getCommodityList(this.follow);
+            });
+          this.batch = false;
+          uni.setNavigationBarTitle({
+            title: "商品管理",
+          });
+        }
+      } else if (this.discountsShow) {
+        this.discountsShow = false;
+        if (value) {
+          uni.$u.http
+            .post(`/api/goods/discount`, {
+              merchant_goods_id: this.selectGoodsInformation.id,
+              mer_discount: value,
+            })
+            .then((res) => {
+              this.getCommodityList(this.follow);
+            });
+        }
+      }
     },
     //打开折扣弹窗
     openDiscountsPopup(value) {
-      this.goodsInformation = value;
+      this.selectGoodsInformation = value;
       this.discountsShow = true;
     },
     toDetail() {
@@ -174,12 +297,12 @@ export default {
         url: "/pageD/productDetails/productDetails",
       });
     },
-    getCommodityList() {
+    getCommodityList(status = "") {
       let userId;
       uni.getStorage({
         key: "user_info",
         success: ({ data }) => {
-          userId = data.id;
+          userId = data.merchant.id;
         },
       });
       uni.$u.http
@@ -187,9 +310,12 @@ export default {
           page: 1,
           limit: 10,
           merchant_id: userId,
+          status: status,
+          keywords: this.keywords,
+          source: this.source,
         })
         .then((res) => {
-          console.log(res);
+          this.goodsList = res.data;
         });
     },
   },
@@ -266,7 +392,7 @@ export default {
 .page {
   padding: 20rpx 24rpx;
   background-color: #fff;
-  height: 85vh;
+  margin-bottom: 150rpx;
 
   .list {
     display: flex;

pageD/commodityManage/component/batchDiscountPopup.vue

@@ -1,130 +1,146 @@
 <template>
-	<u-popup :show="show" mode="bottom" :round="10" closeable @close="close">
-		<view class="content">
-			<view class="goods-information">
-				我要打折
-			</view>
-			<view class="discount">
-				<view class="">
-					折扣
-				</view>
-				<u--input inputAlign="right" placeholder="打8折请输入80" border="none" type="number" v-model="value"
-					@change="change" maxlength="2"></u--input>
-				<view style="margin-left: 10rpx;">
-					%
-				</view>
-			</view>
-			<view class="text-list" v-if=" JSON.stringify(goodsInformation)!='{}'&&value">
-				<view class="_text-1">
-					<text>折扣价</text>
-					<text>￥{{discountPrice}}</text>
-				</view>
-				<view class="_text-1">
-					<text>优惠</text>
-					<text style="color: #f83224;">-￥{{preferential}}</text>
-				</view>
-			</view>
-			<button class="btn">确定</button>
-		</view>
-	</u-popup>
+  <u-popup :show="show" mode="bottom" :round="10" closeable @close="close">
+    <view class="content">
+      <view class="goods-information"> 我要打折 </view>
+      <view class="discount">
+        <view class=""> 折扣 </view>
+        <u--input
+          inputAlign="right"
+          placeholder="打8折请输入80,以原价计算"
+          border="none"
+          type="number"
+          v-model="value"
+          @change="change"
+          maxlength="2"
+        ></u--input>
+        <view style="margin-left: 10rpx"> % </view>
+      </view>
+      <!-- <view
+        class="text-list"
+        v-if="JSON.stringify(selectGoodsInformation) != '{}' && value"
+      >
+        <view class="_text-1">
+          <text>折扣价</text>
+          <text>￥{{ discountPrice }}</text>
+        </view>
+        <view class="_text-1">
+          <text>优惠</text>
+          <text style="color: #f83224">-￥{{ preferential }}</text>
+        </view>
+      </view> -->
+      <button class="btn" @click="confirm">确定</button>
+    </view>
+  </u-popup>
 </template>
 
 <script>
-	export default {
-		props: {
-			show: {
-				typeof: Boolean,
-				default: false
-			},
-			goodsInformation: {
-				typeof: Object,
-				default: {}
-			}
-		},
-		data() {
-			return {
-				value: "",
-				discountPrice: 0,
-				preferential: 0
-			}
-		},
-		methods: {
-			close() {
-				this.$emit('close')
-			},
-			change(e) {
-				console.log(e)
-				this.discountPrice = this.goodsInformation.price * (this.value * 0.01)
-				this.preferential = this.goodsInformation.price - this.discountPrice
-			}
-		}
-	}
+export default {
+  props: {
+    show: {
+      typeof: Boolean,
+      default: false,
+    },
+    selectGoodsInformation: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      value: "",
+      discountPrice: 0,
+      preferential: 0,
+    };
+  },
+  methods: {
+    close() {
+      this.value = "";
+      this.discountPrice = 0;
+      this.preferential = 0;
+      this.$emit("close");
+    },
+    confirm() {
+      this.$emit("close", this.value);
+      this.value = "";
+      this.discountPrice = 0;
+      this.preferential = 0;
+    },
+    change(e) {
+      this.discountPrice =
+        Number(this.selectGoodsInformation.goods.price) * (Number(e) * 0.01);
+      this.preferential =
+        Number(this.selectGoodsInformation.goods.price) - this.discountPrice;
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.content {
-		padding: 30rpx 24rpx;
+.content {
+  padding: 30rpx 24rpx;
 
-		.goods-information {
-			display: flex;
-			justify-content: center;
-			font-weight: 600;
+  .goods-information {
+    display: flex;
+    justify-content: center;
+    font-weight: 600;
 
-			 .goods-img {
-				width: 104rpx;
-				height: 104rpx;
-				border-radius: 10rpx;
-				margin-right: 20rpx;
-			}
+    .goods-img {
+      width: 104rpx;
+      height: 104rpx;
+      border-radius: 10rpx;
+      margin-right: 20rpx;
+    }
 
-			.goods-right {
-				display: flex;
-				flex-direction: column;
-				justify-content: space-around;
+    .goods-right {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-around;
 
-				.title {
-					font-size: 28rpx;
-					color: #333;
-				}
+      .title {
+        font-size: 28rpx;
+        color: #333;
+      }
 
-				.price {
-					font-size: 28rpx;
-					opacity: 0.8;
-					color: #333;
-				}
-			}
-		}
+      .price {
+        font-size: 28rpx;
+        opacity: 0.8;
+        color: #333;
+      }
+    }
+  }
 
-		.discount {
-			display: flex;
-			padding: 36rpx;
-			border-radius: 10rpx;
-			border: 2rpx solid #f83224;
-			margin-top: 56rpx;
-			font-size: 30rpx;
-			color: #222;
-			align-items: center;
-			font-weight: 600;
-		}
+  .discount {
+    display: flex;
+    padding: 36rpx;
+    border-radius: 10rpx;
+    border: 2rpx solid #f83224;
+    margin-top: 56rpx;
+    font-size: 30rpx;
+    color: #222;
+    align-items: center;
+    font-weight: 600;
+  }
 
-		.text-list {
-			border-top: 2rpx solid rgba(151, 151, 151, .1);
-			margin-top: 40rpx;
+  .text-list {
+    border-top: 2rpx solid rgba(151, 151, 151, 0.1);
+    margin-top: 40rpx;
 
-			._text-1 {
-				display: flex;
-				justify-content: space-between;
-				height: 100rpx;
-				align-items: center;
-				font-size: 28rpx;
-			}
-		}
+    ._text-1 {
+      display: flex;
+      justify-content: space-between;
+      height: 100rpx;
+      align-items: center;
+      font-size: 28rpx;
+    }
+  }
 
-		.btn {
-			background-color: #f83224;
-			border-radius: 44rpx;
-			color: #fff;
-			margin-top: 100rpx;
-		}
-	}
-</style>
+  .btn {
+    background-color: #f83224;
+    border-radius: 44rpx;
+    color: #fff;
+    margin-top: 100rpx;
+  }
+}
+</style>

pageD/commodityManage/component/discountsPopup.vue

@@ -1,137 +1,163 @@
 <template>
-	<u-popup :show="show" mode="bottom" :round="10" closeable @close="close">
-		<view class="content">
-			<view class="goods-information">
-				<image class="goods-img" :src="goodsInformation.url" mode=""></image>
-				<view class="goods-right">
-					<view class="title">
-						{{goodsInformation.title}}
-					</view>
-					<view class="price">
-						￥{{goodsInformation.price}}
-					</view>
-				</view>
-			</view>
-			<view class="discount">
-				<view class="">
-					折扣
-				</view>
-				<u--input inputAlign="right" placeholder="打8折请输入80" border="none" type="number" v-model="value"
-					@change="change" maxlength="2"></u--input>
-				<view style="margin-left: 10rpx;">
-					%
-				</view>
-			</view>
-			<view class="text-list" v-if="value">
-				<view class="_text-1">
-					<text>折扣价</text>
-					<text>￥{{discountPrice}}</text>
-				</view>
-				<view class="_text-1">
-					<text>优惠</text>
-					<text style="color: #f83224;">-￥{{preferential}}</text>
-				</view>
-			</view>
-			<button class="btn">确定</button>
-		</view>
-	</u-popup>
+  <u-popup :show="show" mode="bottom" :round="10" closeable @close="close">
+    <view class="content">
+      <view class="goods-information" v-if="selectGoodsInformation.goods">
+        <image
+          class="goods-img"
+          :src="selectGoodsInformation.goods.image"
+          mode=""
+        ></image>
+        <view class="goods-right">
+          <view class="title">
+            {{ selectGoodsInformation.goods.name_cn }}
+          </view>
+          <view class="price">
+            ￥{{ selectGoodsInformation.goods.discount_price }}
+          </view>
+        </view>
+      </view>
+      <view class="discount">
+        <view class=""> 折扣 </view>
+        <u--input
+          inputAlign="right"
+          placeholder="打8折请输入80,以原价计算"
+          border="none"
+          type="number"
+          v-model="value"
+          @change="change"
+          maxlength="2"
+        ></u--input>
+        <view style="margin-left: 10rpx"> % </view>
+      </view>
+      <view class="text-list" v-if="value">
+        <view class="_text-1">
+          <text>折扣价</text>
+          <text>￥{{ discountPrice }}</text>
+        </view>
+        <view class="_text-1">
+          <text>优惠</text>
+          <text style="color: #f83224">-￥{{ preferential }}</text>
+        </view>
+      </view>
+      <button class="btn" @click="confirm">确定</button>
+    </view>
+  </u-popup>
 </template>
 
 <script>
-	export default {
-		props: {
-			show: {
-				typeof: Boolean,
-				default: false
-			},
-			goodsInformation: {
-				typeof: Object,
-				default: {}
-			}
-		},
-		data() {
-			return {
-				value: "",
-				discountPrice: 0,
-				preferential: 0
-			}
-		},
-		methods: {
-			close() {
-				this.$emit('close')
-			},
-			change(e) {
-				console.log(e)
-				this.discountPrice = this.goodsInformation.price * (this.value * 0.01)
-				this.preferential = this.goodsInformation.price - this.discountPrice
-			}
-		}
-	}
+export default {
+  props: {
+    show: {
+      typeof: Boolean,
+      default: false,
+    },
+    selectGoodsInformation: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      value: "",
+      discountPrice: 0,
+      preferential: 0,
+    };
+  },
+  methods: {
+    close() {
+      this.value = "";
+      this.discountPrice = 0;
+      this.preferential = 0;
+      this.$emit("close");
+    },
+    confirm() {
+      this.$emit("close", this.value);
+      this.value = "";
+      this.discountPrice = 0;
+      this.preferential = 0;
+    },
+    change(e) {
+      console.log(this.selectGoodsInformation);
+      this.discountPrice =
+        Number(this.selectGoodsInformation.goods.discount_price) *
+        (Number(e) * 0.01);
+      this.preferential =
+        Number(this.selectGoodsInformation.goods.discount_price) -
+        this.discountPrice;
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.content {
-		padding: 30rpx 24rpx;
+.content {
+  padding: 30rpx 24rpx;
 
-		.goods-information {
-			display: flex;
-			justify-content: flex-start;
+  .goods-information {
+    display: flex;
+    justify-content: flex-start;
 
-			.goods-img {
-				width: 104rpx;
-				height: 104rpx;
-				border-radius: 10rpx;
-				margin-right: 20rpx;
-			}
+    .goods-img {
+      width: 104rpx;
+      height: 104rpx;
+      border-radius: 10rpx;
+      margin-right: 20rpx;
+    }
 
-			.goods-right {
-				display: flex;
-				flex-direction: column;
-				justify-content: space-around;
+    .goods-right {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-around;
+      width: 70%;
+      .title {
+        font-size: 28rpx;
+        color: #333;
+        width: 70%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
 
-				.title {
-					font-size: 28rpx;
-					color: #333;
-				}
+      .price {
+        font-size: 28rpx;
+        opacity: 0.8;
+        color: #333;
+      }
+    }
+  }
 
-				.price {
-					font-size: 28rpx;
-					opacity: 0.8;
-					color: #333;
-				}
-			}
-		}
+  .discount {
+    display: flex;
+    padding: 36rpx;
+    border-radius: 10rpx;
+    border: 2rpx solid #f83224;
+    margin-top: 56rpx;
+    font-size: 30rpx;
+    color: #222;
+    align-items: center;
+    font-weight: 600;
+  }
 
-		.discount {
-			display: flex;
-			padding: 36rpx;
-			border-radius: 10rpx;
-			border: 2rpx solid #f83224;
-			margin-top: 56rpx;
-			font-size: 30rpx;
-			color: #222;
-			align-items: center;
-			font-weight: 600;
-		}
+  .text-list {
+    border-top: 2rpx solid rgba(151, 151, 151, 0.1);
+    margin-top: 40rpx;
 
-		.text-list {
-			border-top: 2rpx solid rgba(151, 151, 151, .1);
-			margin-top: 40rpx;
+    ._text-1 {
+      display: flex;
+      justify-content: space-between;
+      height: 100rpx;
+      align-items: center;
+      font-size: 28rpx;
+    }
+  }
 
-			._text-1 {
-				display: flex;
-				justify-content: space-between;
-				height: 100rpx;
-				align-items: center;
-				font-size: 28rpx;
-			}
-		}
-
-		.btn {
-			background-color: #f83224;
-			border-radius: 44rpx;
-			color: #fff;
-			margin-top: 30rpx;
-		}
-	}
-</style>
+  .btn {
+    background-color: #f83224;
+    border-radius: 44rpx;
+    color: #fff;
+    margin-top: 30rpx;
+  }
+}
+</style>

pageD/commodityManage/component/goodsInformation.vue

@@ -0,0 +1,250 @@
+<template>
+  <view class="detail" @click="$emit('toDetail', itemInfo)" :style="isPadding">
+    <view class="content">
+      <image :src="itemInfo.goods.image" mode="" class="content-img"></image>
+      <view class="mask" v-if="itemInfo.goods.status == 'down'">
+        <view class="text-1"> 已下架 </view>
+      </view>
+      <view class="content-right">
+        <view class="goods-title">
+          <view class="_label" v-if="itemInfo.goods.source == 2"> 供应商 </view>
+          <view
+            class="_label"
+            style="background-color: #f83224"
+            v-if="itemInfo.goods.source == 1"
+          >
+            自营
+          </view>
+          <view class="_label" v-if="itemInfo.goods.source == 0"> 团长 </view>
+          <view class="title" v-if="productAndCommodity == 'product'">
+            {{ itemInfo.name_cn }}
+          </view>
+          <view class="title" v-else>{{ itemInfo.goods.name_cn }}</view>
+        </view>
+        <view class="inventory" v-if="productAndCommodity">
+          <text>库存：</text>
+          <text>{{ itemInfo.goods.stock }}</text>
+        </view>
+        <view class="inventory" v-else>
+          <text>{{ itemInfo.labels.join(" | ") }} </text>
+        </view>
+
+        <view class="price">
+          <view class="commodity-price">
+            <text style="font-size: 20rpx">￥</text>
+            <text>{{ itemInfo.goods.discount_price.split(".")[0] }}</text
+            >.
+            <text style="font-size: 20rpx">{{
+              itemInfo.goods.discount_price.split(".")[1]
+            }}</text>
+          </view>
+          <view
+            class="discount_price"
+            v-if="itemInfo.goods.price != itemInfo.goods.discount_price"
+          >
+            ￥{{ itemInfo.goods.price }}</view
+          >
+        </view>
+      </view>
+    </view>
+
+    <view class="btn-list" v-if="!batch && productAndCommodity == 'commodity'">
+      <button
+        class="btn-1"
+        v-if="itemInfo.goods.status == 'normal'"
+        @click.stop="$emit('openDiscountsPopup', itemInfo)"
+      >
+        我要打折
+      </button>
+      <button class="btn-1" v-if="itemInfo.goods.status == 'normal'">
+        下架
+      </button>
+      <button class="btn-1" v-if="itemInfo.goods.status == 'down'">删除</button>
+      <button class="btn-1" v-if="itemInfo.goods.status == 'down'">上架</button>
+      <!-- <button class="btn-2" v-if="itemInfo.goods.status == 'down'">编辑</button> -->
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    status: {
+      typeof: String,
+      default: "",
+    },
+    itemInfo: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+    productAndCommodity: {
+      typeof: String,
+      default: "",
+    },
+    batch: {
+      typeof: Boolean,
+      default: false,
+    },
+  },
+  watch: {},
+  data() {
+    return {
+      obj: {
+        url: "https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",
+        title: "La Chapelle Sport拉夏贝尔高…",
+        price: "75.00",
+      },
+      lebelList: [],
+    };
+  },
+  computed: {
+    isPadding() {
+      if (this.productAndCommodity == "product") {
+        return "padding: 28rpx 20rpx 20rpx;";
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.detail {
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin: 10rpx 0;
+  width: 96%;
+
+  .content {
+    display: flex;
+    position: relative;
+    flex-shrink: 0;
+    justify-content: flex-start;
+    width: 100%;
+
+    .content-img {
+      width: 164rpx;
+      height: 164rpx;
+      border-radius: 12rpx;
+      margin-right: 20rpx;
+      flex-shrink: 0;
+    }
+
+    .mask {
+      width: 164rpx;
+      height: 164rpx;
+      border-radius: 12rpx;
+      position: absolute;
+      background-color: rgba(255, 255, 255, 0.3);
+      z-index: 100;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      .text-1 {
+        width: 108rpx;
+        height: 44rpx;
+        text-align: center;
+        line-height: 44rpx;
+        color: #fff;
+        background-color: rgba(0, 0, 0, 0.4);
+        border-radius: 22rpx;
+        font-size: 20rpx;
+      }
+    }
+
+    .content-right {
+      width: 80%;
+      .goods-title {
+        color: #333;
+        margin-bottom: 20rpx;
+        width: 88%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        word-break: break-word;
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+
+        .title {
+          width: 75%;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          word-break: break-word;
+        }
+
+        ._label {
+          color: #fff;
+          background-color: #ffb111;
+          width: 72rpx;
+          height: 32rpx;
+          text-align: center;
+          line-height: 32rpx;
+          height: 32rpx;
+          border-radius: 4rpx;
+          font-size: 20rpx;
+          margin-right: 10rpx;
+        }
+      }
+
+      .inventory {
+        color: rgba(54, 54, 54, 0.5);
+        font-size: 24rpx;
+        margin-bottom: 30rpx;
+      }
+
+      .commodity-price {
+        color: #f83224;
+        font-size: 32rpx;
+        font-weight: 600;
+      }
+      .price {
+        display: flex;
+        align-items: flex-end;
+        .discount_price {
+          margin-left: 20rpx;
+          font-size: 26rpx;
+          color: rgba(51, 51, 51, 0.5);
+          text-decoration-line: line-through;
+        }
+      }
+    }
+  }
+
+  .btn-list {
+    display: flex;
+    justify-content: flex-end;
+
+    .btn-1 {
+      height: 60rpx;
+      margin: 0;
+      padding: 0;
+      font-size: 26rpx;
+      color: #333;
+      border: 2rpx solid rgba(151, 151, 151, 0.3);
+      border-radius: 30rpx;
+      background-color: #fff;
+      line-height: 60rpx;
+      margin-left: 20rpx;
+      padding: 0 30rpx;
+    }
+
+    .btn-2 {
+      height: 60rpx;
+      margin: 0;
+      padding: 0;
+      font-size: 26rpx;
+      color: #f83224;
+      border: 2rpx solid #f83224;
+      border-radius: 30rpx;
+      background-color: #fff;
+      margin-left: 20rpx;
+      line-height: 60rpx;
+      padding: 0 30rpx;
+    }
+  }
+}
+</style>

pageD/commodityManage/component/screenPopup.vue

@@ -1,187 +1,224 @@
 <template>
-	<view class="">
-		<u-popup :show="show" :round="10" mode="top" @close="close">
-			<view class="top-tab-search">
-				<view class="search">
-					<u--input placeholder="搜索商品名称" shape="circle" prefixIcon="search"
-						prefixIconStyle="font-size: 22px;color: #909399"></u--input>
-					<view class="screen" @click="openPopup">
-						筛选
-						<image class="screen-icon" src="../../../static/mine/335.png" mode=""></image>
-					</view>
-				</view>
-				<view class="tab">
-					<view class="top-tab">
-						<view :class="{commodity:followPopup==1}" class="tab" @click="tabSwitch(1)">
-							全部
-						</view>
-						<view :class="{commodity:followPopup==2}" class="tab" @click="tabSwitch(2)">
-							已上架
-						</view>
-						<view :class="{commodity:followPopup==3}" class="tab" @click="tabSwitch(3)">
-							已下架
-						</view>
-					</view>
-				</view>
-				<view class="btn-list">
-					<view :class="{'select-tab':selectTab == 1}" @click="selected(1)">我的商品</view>
-					<view :class="{'select-tab':selectTab == 2}" @click="selected(2)">供应链商品</view>
-					<view :class="{'select-tab':selectTab == 3}" @click="selected(3)">平台自营商品</view>
-				</view>
-				<view class="reset-config">
-					<button class="reset">重置</button><button class="config">确定</button>
-				</view>
-			</view>
-		</u-popup>
-	</view>
+  <view class="">
+    <u-popup :show="show" :round="10" mode="top" @close="close">
+      <view class="top-tab-search">
+        <view class="search">
+          <u--input
+            v-model="searchData.keywords"
+            placeholder="搜索商品名称"
+            shape="circle"
+            prefixIcon="search"
+            prefixIconStyle="font-size: 22px;color: #909399"
+          ></u--input>
+          <view class="screen" @click="openPopup">
+            筛选
+            <image
+              class="screen-icon"
+              src="../../../static/mine/335.png"
+              mode=""
+            ></image>
+          </view>
+        </view>
+        <view class="tab">
+          <view class="top-tab">
+            <view
+              :class="{ commodity: followPopup == '' }"
+              class="tab"
+              @click="tabSwitch('')"
+            >
+              全部
+            </view>
+            <view
+              :class="{ commodity: followPopup == 'normal' }"
+              class="tab"
+              @click="tabSwitch('normal')"
+            >
+              已上架
+            </view>
+            <view
+              :class="{ commodity: followPopup == 'down' }"
+              class="tab"
+              @click="tabSwitch('down')"
+            >
+              已下架
+            </view>
+          </view>
+        </view>
+        <view class="btn-list">
+          <view :class="{ 'select-tab': selectTab == 0 }" @click="selected(0)"
+            >我的商品</view
+          >
+          <view :class="{ 'select-tab': selectTab == 1 }" @click="selected(1)"
+            >供应链商品</view
+          >
+          <view :class="{ 'select-tab': selectTab == 2 }" @click="selected(2)"
+            >平台自营商品</view
+          >
+        </view>
+        <view class="reset-config">
+          <button class="reset" @click="close">重置</button
+          ><button class="config" @click="confirm">确定</button>
+        </view>
+      </view>
+    </u-popup>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				followPopup: 1,
-				selectTab:1
-			}
-		},
-		props: {
-			follow: {
-				typeof: Number,
-				default: 1
-			},
-			show: {
-				typeof: Boolean,
-				default: false
-			}
-		},
-		watch: {
-			//监听横向tab栏的数据，同步父组件和子组件横向tab栏的状态
-			follow(newVal) {
-				this.followPopup = newVal
-			}
-		},
-		methods: {
-			//切换tab
-			tabSwitch(num) {
-				this.followPopup = num
-			},
-			//关闭弹窗,将数据传入如=父组件
-			close() {
-				this.$emit('close', this.followPopup)
-			},
-			//切换选中状态
-			selected(num){
-				this.selectTab = num
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      followPopup: "",
+      selectTab: 0,
+      searchData: {
+        keywords: "",
+        status: "",
+        source: "0",
+      },
+    };
+  },
+  props: {
+    follow: {
+      typeof: String,
+      default: "",
+    },
+    show: {
+      typeof: Boolean,
+      default: false,
+    },
+  },
+  watch: {
+    //监听横向tab栏的数据，同步父组件和子组件横向tab栏的状态
+    follow(newVal) {
+      this.followPopup = newVal;
+    },
+  },
+  methods: {
+    //切换tab
+    tabSwitch(num) {
+      this.followPopup = num;
+      this.searchData.status = num;
+    },
+    //关闭弹窗,将数据传入如=父组件
+    close() {
+      this.$emit("close");
+    },
+    confirm() {
+      this.$emit("close", this.searchData);
+    },
+    //切换选中状态
+    selected(num) {
+      this.selectTab = num;
+      this.searchData.source = num;
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.top-tab-search {
-		background-color: #fff;
-		padding: 10rpx 24rpx;
-		z-index: 20174;
+.top-tab-search {
+  background-color: #fff;
+  padding: 10rpx 24rpx;
+  z-index: 20174;
 
-		.search {
-			display: flex;
-			align-items: center;
+  .search {
+    display: flex;
+    align-items: center;
 
-			.screen {
-				display: flex;
-				align-items: center;
-				font-size: 26rpx;
-				color: #F83224 ;
-				font-weight: 600;
-				margin-left: 20rpx;
+    .screen {
+      display: flex;
+      align-items: center;
+      font-size: 26rpx;
+      color: #f83224;
+      font-weight: 600;
+      margin-left: 20rpx;
 
-				.screen-icon {
-					width: 24rpx;
-					height: 24rpx;
-					margin-left: 5rpx;
-				}
-			}
-		}
+      .screen-icon {
+        width: 24rpx;
+        height: 24rpx;
+        margin-left: 5rpx;
+      }
+    }
+  }
 
-		.top-tab {
-			margin-top: 10rpx;
-			padding: 0 20rpx;
-			display: flex;
-			justify-content: space-between;
+  .top-tab {
+    margin-top: 10rpx;
+    padding: 0 20rpx;
+    display: flex;
+    justify-content: space-between;
 
-			.tab {
-				font-size: 26rpx;
-				color: rgba(34, 34, 34, .8);
-				flex-shrink: 0;
-				height: 44rpx;
-				display: flex;
-				align-items: flex-end;
-				padding-bottom: 12rpx;
-			}
+    .tab {
+      font-size: 26rpx;
+      color: rgba(34, 34, 34, 0.8);
+      flex-shrink: 0;
+      height: 44rpx;
+      display: flex;
+      align-items: flex-end;
+      padding-bottom: 12rpx;
+    }
 
-			.commodity {
-				position: relative;
-				font-weight: 600;
-			}
+    .commodity {
+      position: relative;
+      font-weight: 600;
+    }
 
-			.commodity::before {
-				content: '';
-				display: block;
-				height: 4rpx;
-				width: 50%;
-				background: #f83224;
-				position: absolute;
-				bottom: -10rpx;
-				opacity: 0.8;
-				left: 50%;
-				transform: translate(-50%, 50%);
-			}
-		}
-		.btn-list{
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			margin-top: 32rpx;
-			view{
-				width: 210rpx;
-				height: 68rpx;
-				text-align: center;
-				line-height: 68rpx;
-				background-color: #f3f3f3;
-				border-radius: 10rpx;
-				font-size: 26rpx;
-				color: #444;
-			}
-			.select-tab{
-				background-color: rgba(248, 50, 36, .1);
-				color: #f83224;
-				font-weight: 600;
-			}
-		}
-		.reset-config{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-top: 44rpx;
-			.reset{
-				width: 260rpx;
-				height: 76rpx;
-				background-color: #f3f3f3;
-				border: none;
-				border-radius: 38rpx;
-				color: #333;
-				font-size: 28rpx;
-			}
-			.config{
-				width: 402rpx;
-				height: 76rpx;
-				background-color: #F83224;
-				color: #fff;
-				border: none;
-				border-radius: 38rpx;
-				font-size: 28rpx;
-				
-			}
-		}
-	}
-</style>
+    .commodity::before {
+      content: "";
+      display: block;
+      height: 4rpx;
+      width: 50%;
+      background: #f83224;
+      position: absolute;
+      bottom: -10rpx;
+      opacity: 0.8;
+      left: 50%;
+      transform: translate(-50%, 50%);
+    }
+  }
+  .btn-list {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    margin-top: 32rpx;
+    view {
+      width: 210rpx;
+      height: 68rpx;
+      text-align: center;
+      line-height: 68rpx;
+      background-color: #f3f3f3;
+      border-radius: 10rpx;
+      font-size: 26rpx;
+      color: #444;
+    }
+    .select-tab {
+      background-color: rgba(248, 50, 36, 0.1);
+      color: #f83224;
+      font-weight: 600;
+    }
+  }
+  .reset-config {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 44rpx;
+    .reset {
+      width: 260rpx;
+      height: 76rpx;
+      background-color: #f3f3f3;
+      border: none;
+      border-radius: 38rpx;
+      color: #333;
+      font-size: 28rpx;
+    }
+    .config {
+      width: 402rpx;
+      height: 76rpx;
+      background-color: #f83224;
+      color: #fff;
+      border: none;
+      border-radius: 38rpx;
+      font-size: 28rpx;
+    }
+  }
+}
+</style>

pageD/components/goodsInformation.vue

@@ -36,7 +36,10 @@
           >
             团长
           </view>
-          <view class="title"> {{ itemInfo.name_cn }} </view>
+          <view class="title" v-if="productAndCommodity == 'product'">
+            {{ itemInfo.name_cn }}
+          </view>
+          <view class="title" v-else>{{ itemInfo.name_cn }}</view>
         </view>
         <view class="inventory" v-if="productAndCommodity">
           <text>库存：</text>

pageD/homepage/homepage.vue

@@ -1,254 +1,307 @@
 <template>
-	<view class="page">
-		<!-- 页面渐变色背景 -->
-		<view class="shadow">
-		</view>
-		<!-- 页面渐变色背景 -->
-		<view class="content">
-			<view class="top-information">
-				<image class="user-header"
-					src="https://q3.itc.cn/q_70/images03/20240519/1b4e7565b46241b68288ae482412a866.jpeg" mode="">
-				</image>
-				<view class="btn-list">
-					<button class="btn-1"><u-icon color="#f83224" size="14" name="kefu-ermai"></u-icon>客服</button>
-					<button v-if="isShow " class="btn-1"><u-icon color="#f83224" size="14" name="plus"></u-icon>关注</button>
-				</view>
-				<view class="name">
-					小萌优选🔥（每天0元秒杀）
-				</view>
-
-				<view class="score">
-					<u-rate count="5" disabled :allowHalf="true" :gutter="1" inactiveColor="#ffacab"
-						activeColor="#FF1515" v-model="value" :size='12'></u-rate>
-					<text class="num">{{value}}</text>
-				</view>
-				<view class="sale">
-					<view class="">
-						销售量 <text space="nbsp">{{"&nbsp;"}} 2354w+</text>
-					</view>
-					<text space="nbsp" class="shu">{{"&nbsp;&nbsp;"}} | {{"&nbsp;&nbsp;"}}</text>
-					<view class="">
-						评价总数 <text space="nbsp">{{"&nbsp;"}} 4w+</text>
-					</view>
-				</view>
-			</view>
-
-			<view class="goods-list">
-				<view class="tab-list">
-					<view :class="{tab:selectTab==1}" @click="switchTab(1)">
-						默认
-					</view>
-					<view :class="{tab:selectTab==2}" @click="switchTab(2)">新品</view>
-					<view :class="{tab:selectTab==3}" @click="switchTab(3)">销量</view>
-					<view class="price" :class="{tab:selectTab==4}" @click="switchTab(4)">价格 <view style="display: flex;flex-direction: column;
-					justify-content: center;
-					margin-left: 6rpx;margin-top: 4rpx;">
-							<u-icon name="arrow-up-fill" size="6" :color=" iconUp==1?'#f83224': '#303133'"></u-icon><u-icon :color=" iconUp==2?'#f83224': '#303133'"
-								size="6" name="arrow-down-fill"></u-icon>
-						</view>
-					</view>
-				</view>
-				<view class="goods">
-					<GoodsCard @toDetail="toDetail" />
-					<GoodsCard @toDetail="toDetail"/>
-					<GoodsCard @toDetail="toDetail"/>
-					<GoodsCard @toDetail="toDetail"/>
-				</view>
-				
-			</view>
-		</view>
-
-
-	</view>
+  <view class="page">
+    <!-- 页面渐变色背景 -->
+    <view class="shadow"> </view>
+    <!-- 页面渐变色背景 -->
+    <view class="content">
+      <view class="top-information">
+        <image
+          class="user-header"
+          src="https://q3.itc.cn/q_70/images03/20240519/1b4e7565b46241b68288ae482412a866.jpeg"
+          mode=""
+        >
+        </image>
+        <view class="btn-list">
+          <button class="btn-1">
+            <u-icon color="#f83224" size="14" name="kefu-ermai"></u-icon>客服
+          </button>
+          <button v-if="isShow" class="btn-1">
+            <u-icon color="#f83224" size="14" name="plus"></u-icon>关注
+          </button>
+        </view>
+        <view class="name"> 小萌优选🔥（每天0元秒杀） </view>
+
+        <view class="score">
+          <u-rate
+            count="5"
+            disabled
+            :allowHalf="true"
+            :gutter="1"
+            inactiveColor="#ffacab"
+            activeColor="#FF1515"
+            v-model="value"
+            :size="12"
+          ></u-rate>
+          <text class="num">{{ value }}</text>
+        </view>
+        <view class="sale">
+          <view class="">
+            销售量 <text space="nbsp">{{ "&nbsp;" }} 2354w+</text>
+          </view>
+          <text space="nbsp" class="shu"
+            >{{ "&nbsp;&nbsp;" }} | {{ "&nbsp;&nbsp;" }}</text
+          >
+          <view class="">
+            评价总数 <text space="nbsp">{{ "&nbsp;" }} 4w+</text>
+          </view>
+        </view>
+      </view>
+
+      <view class="goods-list">
+        <view class="tab-list">
+          <view :class="{ tab: selectTab == 1 }" @click="switchTab(1)">
+            默认
+          </view>
+          <view :class="{ tab: selectTab == 2 }" @click="switchTab(2)"
+            >新品</view
+          >
+          <view :class="{ tab: selectTab == 3 }" @click="switchTab(3)"
+            >销量</view
+          >
+          <view
+            class="price"
+            :class="{ tab: selectTab == 4 }"
+            @click="switchTab(4)"
+            >价格
+            <view
+              style="
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+                margin-left: 6rpx;
+                margin-top: 4rpx;
+              "
+            >
+              <u-icon
+                name="arrow-up-fill"
+                size="6"
+                :color="iconUp == 1 ? '#f83224' : '#303133'"
+              ></u-icon
+              ><u-icon
+                :color="iconUp == 2 ? '#f83224' : '#303133'"
+                size="6"
+                name="arrow-down-fill"
+              ></u-icon>
+            </view>
+          </view>
+        </view>
+        <view class="goods">
+          <GoodsCard @toDetail="toDetail" />
+          <GoodsCard @toDetail="toDetail" />
+          <GoodsCard @toDetail="toDetail" />
+          <GoodsCard @toDetail="toDetail" />
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import GoodsCard from './component/goodsCard.vue';
-	export default {
-		components:{
-			GoodsCard
-		},
-		data() {
-			return {
-				value: 4,
-				selectTab: 0,
-				iconUp:0,
-				isShow:true
-			};
-		},
-		onLoad(option) {
-			this.isShow =JSON.parse(option.page)
-		},
-		methods: {
-			switchTab(num) {
-				this.selectTab = num
-				if(num == 4){
-					// this.iconUp = this.iconUp == 0 ? 1:2 
-					// if(this.iconUp == 2){
-					// 	this.iconUp =1
-					// }
-					switch(this.iconUp){
-						case 1:
-						this.iconUp = 2;
-						break;
-						case 0:
-						this.iconUp = 1;
-						break;
-						case 2:
-						this.iconUp = 1;
-						break;
-					}
-				}else{
-					this.iconUp = 0
-				}
-			},
-			toDetail(item){
-				uni.navigateTo({
-					url:"/pageA/productdetails"
-				})
-			}
-		},
-		mounted() {
-			//设置顶部导航栏颜色
-			uni.setNavigationBarColor({
-				frontColor: '#ffffff',
-				backgroundColor: '#f74639'
-			})
-		}
-	}
+import GoodsCard from "./component/goodsCard.vue";
+export default {
+  components: {
+    GoodsCard,
+  },
+  data() {
+    return {
+      value: 4,
+      selectTab: 0,
+      iconUp: 0,
+      isShow: true,
+    };
+  },
+  onLoad(option) {
+    this.isShow = JSON.parse(option.page);
+  },
+  methods: {
+    switchTab(num) {
+      this.selectTab = num;
+      if (num == 4) {
+        // this.iconUp = this.iconUp == 0 ? 1:2
+        // if(this.iconUp == 2){
+        // 	this.iconUp =1
+        // }
+        switch (this.iconUp) {
+          case 1:
+            this.iconUp = 2;
+            break;
+          case 0:
+            this.iconUp = 1;
+            break;
+          case 2:
+            this.iconUp = 1;
+            break;
+        }
+      } else {
+        this.iconUp = 0;
+      }
+    },
+    toDetail(item) {
+      uni.navigateTo({
+        url: "/pageA/productdetails",
+      });
+    },
+    getCommodityList(status = "") {
+      let userId;
+      uni.getStorage({
+        key: "user_info",
+        success: ({ data }) => {
+          console.log(data);
+          userId = data.merchant.id;
+        },
+      });
+      uni.$u.http
+        .post(`/api/goods/merchant_goods`, {
+          page: 1,
+          limit: 10,
+          merchant_id: userId,
+          status: status,
+          keywords: this.keywords,
+          source: this.source,
+        })
+        .then((res) => {
+          this.goodsList = res.data;
+        });
+    },
+  },
+  mounted() {
+    this.getCommodityList();
+    //设置顶部导航栏颜色
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#f74639",
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		.shadow {
-			position: absolute;
-			top: 0;
-			height: 300px;
-			width: 100%;
-			background: linear-gradient(#f74639, #f4f4f4);
-			z-index: -1;
-		}
-
-		.content {
-			padding: 20rpx 24rpx;
-			margin-top: 76rpx;
-
-			.top-information {
-				position: relative;
-				border-radius: 20rpx;
-				background-color: #fff;
-				padding: 28rpx 24rpx;
-				
-				::v-deep .u-icon__icon {
-					color: #f83224 !important;
-				}
-				
-				.user-header {
-					width: 164rpx;
-					height: 164rpx;
-					border-radius: 50%;
-					border: 2rpx solid #fff;
-					position: absolute;
-					top: -80rpx;
-					left: 28rpx;
-				}
-
-				.btn-list {
-					display: flex;
-					align-items: center;
-					justify-content: flex-end;
-
-					.btn-1 {
-						border: 2rpx solid #f83224;
-						background-color: #fff;
-						color: #f83224;
-						padding: 0;
-						margin: 0;
-						display: flex;
-						justify-content: space-around;
-						align-items: center;
-						height: 52rpx;
-						border-radius: 24rpx;
-						line-height: 52rpx;
-						font-size: 26rpx;
-						padding: 0 28rpx;
-						margin-left: 20rpx;
-					}
-				}
-
-				.name {
-					margin-top: 28rpx;
-					font-weight: 600;
-					font-size: 32rpx;
-					color: #333333;
-				}
-
-				.score {
-					width: 148rpx;
-					height: 28rpx;
-					background-color: rgba(255, 27, 0, 0.1);
-					display: flex;
-					border-radius: 12rpx;
-					margin-top: 16rpx;
-					justify-content: space-around;
-
-					.num {
-						font-size: 22rpx;
-						color: #ff1515;
-						font-weight: 600;
-					}
-				}
-
-				.sale {
-					display: flex;
-					align-items: center;
-					font-size: 24rpx;
-					color: #777;
-					margin-top: 20rpx;
-
-					.shu {
-						font-size: 16rpx;
-						color: #979797;
-						opacity: .2;
-					}
-				}
-
-			}
-		}
-
-		.goods-list {
-			border-radius: 20rpx;
-			background-color: #fff;
-			padding: 0 20rpx;
-			margin-top: 20rpx;
-
-			.tab-list {
-				height: 96rpx;
-				display: flex;
-				justify-content: space-around;
-				align-items: center;
-				font-size: 26rpx;
-				color: #333333;
-				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
-				margin-bottom: 20rpx;
-				.tab {
-					color: #000;
-					font-weight: 600;
-				}
-
-				.price {
-					display: flex;
-					align-items: center;
-				}
-			}
-			.goods{
-				display: flex;
-				flex-wrap: wrap;
-				justify-content: space-between;
-			}
-		}
-
-	}
-
-
-</style>
+.page {
+  .shadow {
+    position: absolute;
+    top: 0;
+    height: 300px;
+    width: 100%;
+    background: linear-gradient(#f74639, #f4f4f4);
+    z-index: -1;
+  }
+
+  .content {
+    padding: 20rpx 24rpx;
+    margin-top: 76rpx;
+
+    .top-information {
+      position: relative;
+      border-radius: 20rpx;
+      background-color: #fff;
+      padding: 28rpx 24rpx;
+
+      ::v-deep .u-icon__icon {
+        color: #f83224 !important;
+      }
+
+      .user-header {
+        width: 164rpx;
+        height: 164rpx;
+        border-radius: 50%;
+        border: 2rpx solid #fff;
+        position: absolute;
+        top: -80rpx;
+        left: 28rpx;
+      }
+
+      .btn-list {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .btn-1 {
+          border: 2rpx solid #f83224;
+          background-color: #fff;
+          color: #f83224;
+          padding: 0;
+          margin: 0;
+          display: flex;
+          justify-content: space-around;
+          align-items: center;
+          height: 52rpx;
+          border-radius: 24rpx;
+          line-height: 52rpx;
+          font-size: 26rpx;
+          padding: 0 28rpx;
+          margin-left: 20rpx;
+        }
+      }
+
+      .name {
+        margin-top: 28rpx;
+        font-weight: 600;
+        font-size: 32rpx;
+        color: #333333;
+      }
+
+      .score {
+        width: 148rpx;
+        height: 28rpx;
+        background-color: rgba(255, 27, 0, 0.1);
+        display: flex;
+        border-radius: 12rpx;
+        margin-top: 16rpx;
+        justify-content: space-around;
+
+        .num {
+          font-size: 22rpx;
+          color: #ff1515;
+          font-weight: 600;
+        }
+      }
+
+      .sale {
+        display: flex;
+        align-items: center;
+        font-size: 24rpx;
+        color: #777;
+        margin-top: 20rpx;
+
+        .shu {
+          font-size: 16rpx;
+          color: #979797;
+          opacity: 0.2;
+        }
+      }
+    }
+  }
+
+  .goods-list {
+    border-radius: 20rpx;
+    background-color: #fff;
+    padding: 0 20rpx;
+    margin-top: 20rpx;
+
+    .tab-list {
+      height: 96rpx;
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      font-size: 26rpx;
+      color: #333333;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+      margin-bottom: 20rpx;
+      .tab {
+        color: #000;
+        font-weight: 600;
+      }
+
+      .price {
+        display: flex;
+        align-items: center;
+      }
+    }
+    .goods {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+    }
+  }
+}
+</style>

pageD/productDetails/productDetails.vue

@@ -20,7 +20,7 @@
       </view>
     </view>
     <image class="goods-img" :src="commodityDetail.image" mode=""></image>
-    <view class="price">
+    <view class="price" v-if="commodityDetail.discount_price">
       <text style="font-size: 20rpx">折扣价</text>
       <text style="font-size: 18rpx">￥</text>
       <text style="font-size: 36rpx; font-weight: 600">{{
@@ -37,12 +37,9 @@
 
     <view class="goods-detail"> 商品详情 </view>
     <view class="detail">
-      <image
-        class="detail-img"
-        :src="item"
-        v-for="item in commodityDetail.images.split(',')"
-        mode=""
-      ></image>
+      <!-- v-for="item in commodityDetail.images.split(',')" -->
+
+      <image class="detail-img" :src="commodityDetail.images" mode=""></image>
     </view>
 
     <view class="footer">

pages/cart/cart.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 购物车 -->
-  <view>
+  <view class="page">
     <u-navbar :safeAreaInsetTop="true" :placeholder="true">
       <view class="u-nav-slot" slot="left">
         <view class="">
@@ -58,18 +58,30 @@
               v-for="(chid, index) in item.goods"
               :key="index"
             >
-              <u-swipe-action-item :options="options2">
+              <u-swipe-action-item
+                :options="options2"
+                @click="followOrdelete"
+                :autoClose="true"
+                :name="chid.cart.sku_item_id"
+                :disabled="chid.status == 'down'"
+              >
                 <!-- 				<view class="" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 100;background-color: rgba(255, 255, 255, 0.5);"></view> -->
                 <u-checkbox
                   shape="circle"
                   :customStyle="{ marginBottom: '8px' }"
-                  :name="chid.cart.merchant_goods_id"
+                  :name="chid.cart.sku_item_id"
                   activeColor="#F83224"
+                  :disabled="chid.status == 'down'"
                 >
                 </u-checkbox>
                 <view
                   class=""
-                  style="position: relative; width: 172rpx; height: 172rpx"
+                  style="
+                    position: relative;
+                    width: 172rpx;
+                    height: 172rpx;
+                    border-radius: 16rpx;
+                  "
                 >
                   <image
                     :src="chid.image"
@@ -77,11 +89,11 @@
                     mode=""
                   >
                   </image>
-                  <!-- 		<view class="sold">
-										商品下架
-									</view> -->
+                  <view class="down" v-if="chid.status == 'down'"
+                    ><view class="sold"> 商品下架 </view></view
+                  >
                 </view>
-                <view class="good" style="flex: 1">
+                <view class="good" style="flex: 1; margin-left: 10rpx">
                   <view class="goodname">{{ chid.name_cn }}</view>
                   <view class="goods" v-if="chid.sku_item.length > 0">{{
                     chid.sku_item[0].item
@@ -112,7 +124,10 @@
                     </view>
                     <view class="aaaaaa">
                       <!-- <view class="delect" v-if='dele'>{{i18n.delete}}</view> -->
-                      <view class="" v-if="num == chid.cart.id && success">
+                      <view
+                        class=""
+                        v-if="num == chid.cart.sku_item_id && success"
+                      >
                         <!-- <u-number-box v-model="value" @change="valChange"></u-number-box> -->
                         <u-number-box
                           v-model="chid.cart.goods_num"
@@ -146,11 +161,26 @@
                       </view>
                       <view
                         class="num"
-                        v-if="num != chid.cart.id && success"
-                        @click="num = chid.cart.id"
+                        v-if="
+                          num != chid.cart.sku_item_id &&
+                          success &&
+                          chid.status == 'normal'
+                        "
+                        @click="num = chid.cart.sku_item_id"
                       >
                         x{{ chid.cart.goods_num }}
                       </view>
+                      <view
+                        v-if="chid.status == 'down'"
+                        class="del"
+                        @click="
+                          followOrdelete({
+                            index: 1,
+                            name: chid.cart.sku_item_id,
+                          })
+                        "
+                        >删除</view
+                      >
                     </view>
                     <view v-if="success == false" class="icon">
                       <u-icon name="trash" color="#fff" size="20"></u-icon>
@@ -163,13 +193,22 @@
         </view>
       </view>
     </u-checkbox-group>
+    <u-toast ref="uToast"></u-toast>
     <view class="" style="height: 260rpx"></view>
+    <view class="back-top" @click="backTop">
+      <image
+        class="back-icon"
+        src="../../static/mine/355.png"
+        mode="scaleToFill"
+      />
+      <text class="back-text">顶部</text>
+    </view>
     <kj-tabbar
       ref="tabbar1"
       :value1="3"
       @allSelect="allSelect"
       :goodsWeight="goodsWeight"
-      :goodsPrice="goodsPrice"
+      :goodsPrice="String(goodsPrice.toFixed(2))"
     ></kj-tabbar>
   </view>
 </template>
@@ -221,16 +260,65 @@ export default {
     this.tabarheight = tab;
   },
   methods: {
+    //返回顶部
+    backTop() {
+      uni.pageScrollTo({
+        scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
+        duration: 300, // 滚动动画的时长
+      });
+    },
+
+    //关注商品 or 删除商品
+    followOrdelete(e) {
+      console.log("调用", e);
+      //关注商品
+      if (e.index == 0) {
+        this.goodsList.map((item) => {
+          item.goods.map((items) => {
+            if (e.name == items.cart.sku_item_id) {
+              uni.$u.http
+                .post(`/api/interest/follow`, {
+                  interest_type: 0,
+                  interest_id: items.merchant_goods_id,
+                })
+                .then((res) => {
+                  console.log(res);
+                });
+            }
+          });
+        });
+      } else {
+        //删除商品
+        this.goodsList.map((item) => {
+          item.goods.map((items) => {
+            if (e.name == items.cart.sku_item_id) {
+              uni.$u.http
+                .delete(`/api/cart?ids=${items.cart.id}`)
+                .then((res) => {
+                  this.$refs.uToast.show({
+                    type: "default",
+                    title: "默认主题",
+                    message: "删除成功",
+                  });
+                  this.getShopCarList();
+                });
+            }
+          });
+        });
+      }
+    },
+
     shop(value) {
       let num = 0;
       value.map((item) => {
-        if (this.checkboxValue1.indexOf(item.cart.merchant_goods_id) >= 0) {
+        if (this.checkboxValue1.indexOf(item.cart.sku_item_id) >= 0) {
           num++;
         }
       });
       return num;
     },
 
+    //修改购物车商品数量
     addOrReduce(n) {
       uni.$u.http
         .post(`/api/cart/num/${this.num}`, { goods_num: n.value, type: "" })
@@ -241,19 +329,21 @@ export default {
 
     //店铺商品全选
     shopSelectAll(value) {
+      this.goodsPrice = 0;
+      this.goodsWeight = 0;
       //先判断存放选中的数组有没有选中的数据
       if (this.checkboxValue1.length == 0) {
         //没有数据则直接将选中店铺中的商品存入数组
         value.map((item) => {
-          this.checkboxValue1.push(item.cart.merchant_goods_id);
+          this.checkboxValue1.push(item.cart.sku_item_id);
         });
       } else {
         if (this.shop(value) > 0 && this.shop(value) == value.length) {
           value.map((item) => {
             //先判断选中的商品数组中该店铺商品是否已被选中，已被选中则取消选中，未被选中则推入选中状态
-            if (this.checkboxValue1.indexOf(item.cart.merchant_goods_id) >= 0) {
+            if (this.checkboxValue1.indexOf(item.cart.sku_item_id) >= 0) {
               this.checkboxValue1.splice(
-                this.checkboxValue1.indexOf(item.cart.merchant_goods_id),
+                this.checkboxValue1.indexOf(item.cart.sku_item_id),
                 1
               );
             }
@@ -264,10 +354,8 @@ export default {
         ) {
           value.map((item) => {
             //先判断选中的商品数组中该店铺商品是否已被选中，已被选中则取消选中，未被选中则推入选中状态
-            if (
-              this.checkboxValue1.indexOf(item.cart.merchant_goods_id) == -1
-            ) {
-              this.checkboxValue1.push(item.cart.merchant_goods_id);
+            if (this.checkboxValue1.indexOf(item.cart.sku_item_id) == -1) {
+              this.checkboxValue1.push(item.cart.sku_item_id);
             }
           });
         }
@@ -277,6 +365,17 @@ export default {
       } else {
         this.$refs.tabbar1.cancelAll("取消");
       }
+
+      //将选中的商品价格相加
+      this.goodsList.map((item) => {
+        item.goods.map((items) => {
+          if (this.checkboxValue1.indexOf(items.cart.sku_item_id) > -1) {
+            this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
+            this.goodsPrice +=
+              Number(items.sku_item[0].price) * items.cart.goods_num;
+          }
+        });
+      });
       this.shop(value);
     },
     admin() {
@@ -289,15 +388,18 @@ export default {
     checkAll(e) {
       console.log("all", e);
     },
+    //购物车单选
     checkboxChange(n) {
+      //首先将价格和商品重量重置
       this.goodsWeight = 0;
       this.goodsPrice = 0;
       this.checkboxValue1 = n;
       this.goodsList.map((item) => {
         item.goods.map((items) => {
-          if (n.indexOf(items.id) > -1) {
-            this.goodsWeight += items.sku_item[0].weight;
-            this.goodsPrice += Number(items.sku_item[0].price);
+          if (n.indexOf(items.cart.sku_item_id) > -1) {
+            this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
+            this.goodsPrice +=
+              Number(items.sku_item[0].price) * items.cart.goods_num;
           }
         });
       });
@@ -314,8 +416,6 @@ export default {
       if (this.checkboxValue1.length == this.goodsNum && all.length == 0) {
         return;
       }
-      console.log(this.checkboxValue1.length, this.goodsNum);
-      console.log(this.checkboxValue1, this.goodsNum);
       //判断是否已经全选，如已全选，则取消全选
       if (this.checkboxValue1.length == this.goodsNum) {
         this.checkboxValue1 = [];
@@ -325,12 +425,12 @@ export default {
         this.goodsList.map((item) => {
           item.goods.map((items) => {
             //判断是否有商品已被选中
-            if (
-              this.checkboxValue1.indexOf(items.cart.merchant_goods_id) == -1
-            ) {
-              this.checkboxValue1.push(items.cart.merchant_goods_id);
-              this.goodsWeight += items.sku_item[0].weight;
-              this.goodsPrice += Number(items.sku_item[0].price);
+            if (this.checkboxValue1.indexOf(items.cart.sku_item_id) == -1) {
+              this.checkboxValue1.push(items.cart.sku_item_id);
+              this.goodsWeight +=
+                items.sku_item[0].weight * items.cart.goods_num;
+              this.goodsPrice +=
+                Number(items.sku_item[0].price) * items.cart.goods_num;
             }
           });
         });
@@ -354,6 +454,30 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.page {
+  position: relative;
+  .back-top {
+    position: fixed;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    width: 88rpx;
+    height: 88rpx;
+    background-color: #fff;
+    border-radius: 50%;
+    bottom: 210rpx;
+    right: 20rpx;
+    .back-icon {
+      width: 32rpx;
+      height: 30rpx;
+    }
+    .back-text {
+      font-size: 20rpx;
+      color: #555;
+    }
+  }
+}
 .sold {
   width: 108rpx;
   height: 36rpx;
@@ -463,6 +587,14 @@ export default {
 ::v-deep .u-swipe-action-item__content {
   flex-direction: row !important;
 }
+::v-deep .u-swipe-action-item__right__button__wrapper {
+  width: 32px;
+  word-wrap: break-word;
+  font-size: 20rpx !important;
+}
+::v-deep .u-swipe-action-item__right__button__wrapper__text {
+  word-wrap: break-word;
+}
 
 ::v-deep .u-swipe-action-item {
   width: 100% !important;
@@ -494,6 +626,16 @@ export default {
   text-align: center;
   font-style: normal;
 }
+.del {
+  width: 68rpx;
+  height: 44rpx;
+  text-align: center;
+  line-height: 44rpx;
+  border: 2rpx solid #f83224;
+  color: #f83224;
+  font-size: 20rpx;
+  border-radius: 22rpx;
+}
 
 .box {
   padding: 0rpx 24rpx 20rpx;
@@ -613,4 +755,13 @@ export default {
   text-align: left;
   font-style: normal;
 }
+.down {
+  position: absolute;
+  top: 0;
+  left: 0;
+  background-color: #c7c7c7;
+  opacity: 0.2;
+  width: 100%;
+  height: 100%;
+}
 </style>

pages/mine/component/mineMoney.vue

@@ -24,11 +24,11 @@
         <view class="characters">{{ i18n.balance }}</view>
       </view>
       <view class="basis" @click="toFollow">
-        <view class="num">225</view>
+        <view class="num">{{ userInformation.interest_num }}</view>
         <view class="characters">{{ i18n.mineFollow }}</view>
       </view>
       <view class="basis" @click="toPackage">
-        <view class="num">13</view>
+        <view class="num">{{ userInformation.express_num }}</view>
         <view class="characters">{{ i18n.myPackage }}</view>
       </view>
     </view>

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -32,7 +32,7 @@ page {
 }
 /*每个页面公共css */
 .u-line-1 {
-  display: -webkit-box !important;
+  display: -webkit-box;
   overflow: hidden;
   text-overflow: ellipsis;
   word-break: break-all;
@@ -40,7 +40,7 @@ page {
   -webkit-box-orient: vertical !important;
 }
 .u-line-2 {
-  display: -webkit-box !important;
+  display: -webkit-box;
   overflow: hidden;
   text-overflow: ellipsis;
   word-break: break-all;
@@ -48,7 +48,7 @@ page {
   -webkit-box-orient: vertical !important;
 }
 .u-line-3 {
-  display: -webkit-box !important;
+  display: -webkit-box;
   overflow: hidden;
   text-overflow: ellipsis;
   word-break: break-all;
@@ -56,7 +56,7 @@ page {
   -webkit-box-orient: vertical !important;
 }
 .u-line-4 {
-  display: -webkit-box !important;
+  display: -webkit-box;
   overflow: hidden;
   text-overflow: ellipsis;
   word-break: break-all;
@@ -64,7 +64,7 @@ page {
   -webkit-box-orient: vertical !important;
 }
 .u-line-5 {
-  display: -webkit-box !important;
+  display: -webkit-box;
   overflow: hidden;
   text-overflow: ellipsis;
   word-break: break-all;

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

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

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

@@ -1,16 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageB/index"],{
 
-<<<<<<< HEAD
 /***/ 338:
-/*!***********************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
-  \***********************************************************************************/
-=======
-/***/ 330:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
   \**********************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -20,11 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-<<<<<<< HEAD
 var _index = _interopRequireDefault(__webpack_require__(/*! ./pageB/index.vue */ 339));
-=======
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageB/index.vue */ 331));
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -32,31 +21,19 @@ createPage(_index.default);
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 339:
-/*!******************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue ***!
-  \******************************************************************/
-=======
-/***/ 331:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue ***!
   \*****************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-<<<<<<< HEAD
 /* harmony import */ var _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=ab5bf790& */ 340);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 342);
-=======
-/* harmony import */ var _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=ab5bf790& */ 332);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 334);
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -65,7 +42,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -83,51 +60,32 @@ component.options.__file = "pageB/index.vue"
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 340:
-/*!*************************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
-  \*************************************************************************************************/
-=======
-/***/ 332:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
   \************************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! 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& */ 341);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"]; });
-=======
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 333);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 341);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"]; });
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["components"]; });
 
 
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 341:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/***/ 333:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -151,47 +109,26 @@ render._withStripped = true
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 342:
-/*!*******************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
-  \*******************************************************************************************/
-=======
-/***/ 334:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! 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& */ 343);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
-
-/***/ }),
-
-/***/ 343:
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/* 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& */ 335);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 343);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 335:
+/***/ 343:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -217,9 +154,5 @@ exports.default = _default;
 
 /***/ })
 
-<<<<<<< HEAD
 },[[338,"common/runtime","common/vendor"]]]);
-=======
-},[[330,"common/runtime","common/vendor"]]]);
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageB/index.js.map

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

@@ -1,16 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageC/index"],{
 
-<<<<<<< HEAD
 /***/ 454:
-/*!***********************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
-  \***********************************************************************************/
-=======
-/***/ 446:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
   \**********************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -20,11 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-<<<<<<< HEAD
 var _index = _interopRequireDefault(__webpack_require__(/*! ./pageC/index.vue */ 455));
-=======
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageC/index.vue */ 447));
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -32,31 +21,19 @@ createPage(_index.default);
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 455:
-/*!******************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue ***!
-  \******************************************************************/
-=======
-/***/ 447:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue ***!
   \*****************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-<<<<<<< HEAD
 /* harmony import */ var _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=3f36b6f9& */ 456);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 458);
-=======
-/* harmony import */ var _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=3f36b6f9& */ 448);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 450);
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -65,7 +42,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -83,51 +60,32 @@ component.options.__file = "pageC/index.vue"
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 456:
-/*!*************************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
-  \*************************************************************************************************/
-=======
-/***/ 448:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
   \************************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! 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& */ 457);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"]; });
-=======
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 449);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 457);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"]; });
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["components"]; });
 
 
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 457:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/***/ 449:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -151,47 +109,26 @@ render._withStripped = true
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 458:
-/*!*******************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
-  \*******************************************************************************************/
-=======
-/***/ 450:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! 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& */ 459);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
-
-/***/ }),
-
-/***/ 459:
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/* 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& */ 451);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 459);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 451:
+/***/ 459:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -218,9 +155,5 @@ exports.default = _default;
 
 /***/ })
 
-<<<<<<< HEAD
 },[[454,"common/runtime","common/vendor"]]]);
-=======
-},[[446,"common/runtime","common/vendor"]]]);
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageC/index.js.map

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

@@ -1,16 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageD/index"],{
 
-<<<<<<< HEAD
 /***/ 642:
-/*!***********************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
-  \***********************************************************************************/
-=======
-/***/ 634:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
   \**********************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -20,11 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-<<<<<<< HEAD
 var _index = _interopRequireDefault(__webpack_require__(/*! ./pageD/index.vue */ 643));
-=======
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageD/index.vue */ 635));
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -32,31 +21,19 @@ createPage(_index.default);
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 643:
-/*!******************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue ***!
-  \******************************************************************/
-=======
-/***/ 635:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue ***!
   \*****************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-<<<<<<< HEAD
 /* harmony import */ var _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=57c92c8c& */ 644);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 646);
-=======
-/* harmony import */ var _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=57c92c8c& */ 636);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 638);
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -65,7 +42,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -83,51 +60,32 @@ component.options.__file = "pageD/index.vue"
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 644:
-/*!*************************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
-  \*************************************************************************************************/
-=======
-/***/ 636:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
   \************************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! 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& */ 645);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
-=======
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 637);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 645);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["components"]; });
 
 
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 645:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/***/ 637:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -151,47 +109,26 @@ render._withStripped = true
 
 /***/ }),
 
-<<<<<<< HEAD
 /***/ 646:
-/*!*******************************************************************************************!*\
-  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
-  \*******************************************************************************************/
-=======
-/***/ 638:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! 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& */ 647);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
-
-/***/ }),
-
-/***/ 647:
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-=======
-/* 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& */ 639);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 647);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 639:
+/***/ 647:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -216,9 +153,5 @@ exports.default = _default;
 
 /***/ })
 
-<<<<<<< HEAD
 },[[642,"common/runtime","common/vendor"]]]);
-=======
-},[[634,"common/runtime","common/vendor"]]]);
->>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageD/index.js.map

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

@@ -10,6 +10,7 @@
     "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox",
     "u-number-box": "/uview-ui/components/u-number-box/u-number-box",
     "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "u-toast": "/uview-ui/components/u-toast/u-toast",
     "kj-tabbar": "/components/kj-tabbar/kj-tabbar"
   }
 }

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,16 +9,11 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.4.3",
-  "appid": "wx717c239c464eebbd",
+  "libVersion": "",
+  "appid": "touristappid",
   "projectname": "wx",
   "condition": {
     "search": {
@@ -38,9 +32,5 @@
       "current": -1,
       "list": []
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
   }
 }

uview-ui/libs/css/common.scss

@@ -1,144 +1,142 @@
 // 超出行数，自动显示行尾省略号，最多5行
 // 来自uView的温馨提示：当您在控制台看到此报错，说明需要在App.vue的style标签加上【lang="scss"】
 @for $i from 1 through 5 {
-	.u-line-#{$i} {
-		/* #ifdef APP-NVUE */
-		// nvue下，可以直接使用lines属性，这是weex特有样式
-		lines: $i;
-		text-overflow: ellipsis;
-		overflow: hidden;
-		flex: 1;
-		/* #endif */
-
-		/* #ifndef APP-NVUE */
-		// vue下，单行和多行显示省略号需要单独处理
-		@if $i == '1' {
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-		} @else {
-			display: -webkit-box!important;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			word-break: break-all;
-			-webkit-line-clamp: $i;
-			-webkit-box-orient: vertical!important;
-		}
-		/* #endif */
-	}
+  .u-line-#{$i} {
+    /* #ifdef APP-NVUE */
+    // nvue下，可以直接使用lines属性，这是weex特有样式
+    lines: $i;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    flex: 1;
+    /* #endif */
+
+    /* #ifndef APP-NVUE */
+    // vue下，单行和多行显示省略号需要单独处理
+    @if $i == "1" {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    } @else {
+      display: -webkit-box;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      word-break: break-all;
+      -webkit-line-clamp: $i;
+      -webkit-box-orient: vertical !important;
+    }
+    /* #endif */
+  }
 }
 
-
 // 此处加上!important并非随意乱用，而是因为目前*.nvue页面编译到H5时，
 // App.vue的样式会被uni-app的view元素的自带border属性覆盖，导致无效
 // 综上，这是uni-app的缺陷导致我们为了多端兼容，而必须要加上!important
 // 移动端兼容性较好，直接使用0.5px去实现细边框，不使用伪元素形式实现
 .u-border {
-	border-width: 0.5px!important;
-	border-color: $u-border-color!important;
-    border-style: solid;
+  border-width: 0.5px !important;
+  border-color: $u-border-color !important;
+  border-style: solid;
 }
 
 .u-border-top {
-	border-top-width: 0.5px!important;
-	border-color: $u-border-color!important;
-    border-top-style: solid;
+  border-top-width: 0.5px !important;
+  border-color: $u-border-color !important;
+  border-top-style: solid;
 }
 
 .u-border-left {
-	border-left-width: 0.5px!important;
-	border-color: $u-border-color!important;
-    border-left-style: solid;
+  border-left-width: 0.5px !important;
+  border-color: $u-border-color !important;
+  border-left-style: solid;
 }
 
 .u-border-right {
-	border-right-width: 0.5px!important;
-	border-color: $u-border-color!important;
-    border-right-style: solid;
+  border-right-width: 0.5px !important;
+  border-color: $u-border-color !important;
+  border-right-style: solid;
 }
 
 .u-border-bottom {
-	border-bottom-width: 0.5px!important;
-	border-color: $u-border-color!important;
-    border-bottom-style: solid;
+  border-bottom-width: 0.5px !important;
+  border-color: $u-border-color !important;
+  border-bottom-style: solid;
 }
 
 .u-border-top-bottom {
-	border-top-width: 0.5px!important;
-	border-bottom-width: 0.5px!important;
-	border-color: $u-border-color!important;
-    border-top-style: solid;
-    border-bottom-style: solid;
+  border-top-width: 0.5px !important;
+  border-bottom-width: 0.5px !important;
+  border-color: $u-border-color !important;
+  border-top-style: solid;
+  border-bottom-style: solid;
 }
 
 // 去除button的所有默认样式，让其表现跟普通的view、text元素一样
 .u-reset-button {
-	padding: 0;
-	background-color: transparent;
-	/* #ifndef APP-PLUS */
-	font-size: inherit;
-	line-height: inherit;
-	color: inherit;
-	/* #endif */
-	/* #ifdef APP-NVUE */
-	border-width: 0;
-	/* #endif */
+  padding: 0;
+  background-color: transparent;
+  /* #ifndef APP-PLUS */
+  font-size: inherit;
+  line-height: inherit;
+  color: inherit;
+  /* #endif */
+  /* #ifdef APP-NVUE */
+  border-width: 0;
+  /* #endif */
 }
 
 /* #ifndef APP-NVUE */
 .u-reset-button::after {
-   border: none;
+  border: none;
 }
 /* #endif */
 
 .u-hover-class {
-	opacity: 0.7;
+  opacity: 0.7;
 }
 .u-flex {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	align-items: center;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  align-items: center;
 }
 
 .u-flex-wrap {
-	flex-wrap: wrap;
+  flex-wrap: wrap;
 }
 
 .u-flex-nowrap {
-	flex-wrap: nowrap;
+  flex-wrap: nowrap;
 }
 
 .u-col-center {
-	align-items: center;
+  align-items: center;
 }
 
 .u-col-top {
-	align-items: flex-start;
+  align-items: flex-start;
 }
 
 .u-col-bottom {
-	align-items: flex-end;
+  align-items: flex-end;
 }
 
 .u-row-center {
-	justify-content: center;
+  justify-content: center;
 }
 
 .u-row-left {
-	justify-content: flex-start;
+  justify-content: flex-start;
 }
 
 .u-row-right {
-	justify-content: flex-end;
+  justify-content: flex-end;
 }
 
 .u-row-between {
-	justify-content: space-between;
+  justify-content: space-between;
 }
 
 .u-row-around {
-	justify-content: space-around;
+  justify-content: space-around;
 }
-