冲突

pageA/order.vue

@@ -1,117 +1,100 @@
 <template>
-  <view class="back">
-    <!-- 地址 -->
-    <view class="address" @click="toadd">
-      <view class="u-flex u-row-between">
-        <view class="add" v-if="addinfo">{{ addinfo.full_address }}</view>
-        <view class="" v-else>{{ i18n.shippingaddress }}</view>
-        <u-icon name="arrow-right" size="16"></u-icon>
-      </view>
-      <view class="info" v-if="addinfo">
-        <text>{{ addinfo.name }}</text>
-        <text style="margin-left: 20rpx">{{
+	<view class="back">
+		<!-- 地址 -->
+		<view class="address" @click="toadd">
+			<view class="u-flex u-row-between">
+				<view class="add" v-if="addinfo">{{ addinfo.full_address }}</view>
+				<view class="" v-else>{{ i18n.shippingaddress }}</view>
+				<u-icon name="arrow-right" size="16"></u-icon>
+			</view>
+			<view class="info" v-if="addinfo">
+				<text>{{ addinfo.name }}</text>
+				<text style="margin-left: 20rpx">{{
           replacePhoneToStar(addinfo.mobile)
         }}</text>
-      </view>
-    </view>
-    <!-- 商品 -->
-    <view class="shop">
-      <view class="" v-if="typea == 'shop'">
-        <view
-          class="u-flex"
-          style="margin-top: 32rpx"
-          v-for="(item, idx) in selelist"
-          :key="idx"
-        >
-          <image
-            :src="item.sku_item[0].image"
-            style="width: 184rpx; height: 184rpx"
-            mode=""
-          ></image>
-          <view
-            class=" "
-            style="
+			</view>
+		</view>
+		<!-- 商品 -->
+		<view class="shop">
+			<view class="" v-if="typea == 'shop'">
+				<view class="u-flex" style="margin-top: 32rpx" v-for="(item, idx) in selelist" :key="idx">
+					<image :src="item.sku_item[0].image" style="width: 184rpx; height: 184rpx" mode=""></image>
+					<view class=" " style="
               margin-left: 20rpx;
               flex-direction: column;
               justify-content: space-between;
               height: 184rpx;
               display: flex;
               flex: 1;
-            "
-          >
-            <view class="">
-              <text class="toptitle" v-if="language == 'zh-CN'">{{
+            ">
+						<view class="">
+							<text class="toptitle" v-if="language == 'zh-CN'">{{
                 item.name_cn
               }}</text>
-              <text class="toptitle" v-if="language == 'en-US'">{{
+							<text class="toptitle" v-if="language == 'en-US'">{{
                 item.name_en
               }}</text>
-              <text class="toptitle" v-if="language == 'es-ES'">{{
+							<text class="toptitle" v-if="language == 'es-ES'">{{
                 item.name_es
               }}</text>
-              <text class="toptitle" v-if="language == 'it-IT'">{{
+							<text class="toptitle" v-if="language == 'it-IT'">{{
                 item.name_ita
               }}</text>
-              <view class="weight">{{ item.sku_item[0].item }} </view>
-            </view>
-            <view class="u-flex u-row-between">
-              <view class="">
-                <text class="money">¥</text>
-                <text class="money" style="font-size: 34rpx">{{
+							<view class="weight" v-if="language == 'zh-CN'">{{ item.sku_item[0].item }} </view>
+							<view class="weight" v-if="language == 'en-US'">{{ item.sku_item[0].item_en }} </view>
+							<view class="weight" v-if="language == 'es-ES'">{{ item.sku_item[0].item_es }} </view>
+							<view class="weight" v-if="language == 'it-IT'">{{ item.sku_item[0].item_ita }} </view>
+						</view>
+						<view class="u-flex u-row-between">
+							<view class="">
+								<text class="money">¥</text>
+								<text class="money" style="font-size: 34rpx">{{
                   item.sku_item[0].discount_price
                 }}</text>
-              </view>
-              <view class=""> x {{ item.cart.goods_num }}</view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view class="" v-else>
-        <view class="">
-          <image
-            :src="goodinfo.merchant.image"
-            style="width: 38rpx; height: 38rpx"
-            mode=""
-          ></image>
-          <text class="name">{{ goodinfo.merchant.merchant_name }}</text>
-        </view>
-        <view class="u-flex" style="margin-top: 32rpx">
-          <image
-            :src="sku_info.image"
-            style="width: 184rpx; height: 184rpx"
-            mode=""
-          ></image>
-          <view
-            class=" "
-            style="
+							</view>
+							<view class=""> x {{ item.cart.goods_num }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="" v-else>
+				<view class="">
+					<image :src="goodinfo.merchant.image" style="width: 38rpx; height: 38rpx" mode=""></image>
+					<text class="name">{{ goodinfo.merchant.merchant_name }}</text>
+				</view>
+				<view class="u-flex" style="margin-top: 32rpx">
+					<image :src="sku_info.image" style="width: 184rpx; height: 184rpx" mode=""></image>
+					<view class=" " style="
               margin-left: 20rpx;
               flex-direction: column;
               justify-content: space-between;
               height: 184rpx;
               display: flex;
               flex: 1;
-            "
-          >
-            <view class="">
-              <text class="toptitle" v-if="language == 'zh-CN'">{{
+            ">
+						<view class="">
+							<text class="toptitle" v-if="language == 'zh-CN'">{{
                 goodinfo.name_cn
               }}</text>
-              <text class="toptitle" v-if="language == 'en-US'">{{
+							<text class="toptitle" v-if="language == 'en-US'">{{
                 goodinfo.name_en
               }}</text>
-              <text class="toptitle" v-if="language == 'es-ES'">{{
+							<text class="toptitle" v-if="language == 'es-ES'">{{
                 goodinfo.name_es
               }}</text>
-              <text class="toptitle" v-if="language == 'it-IT'">{{
+							<text class="toptitle" v-if="language == 'it-IT'">{{
                 goodinfo.name_ita
               }}</text>
-              <view class="weight">{{ sku_info.item }} </view>
-              <!-- <view class="">{{Number(sku_info.weight)*value}}kg</view> -->
-            </view>
-            <view class="u-flex u-row-between">
-              <view class="">
-                <text class="money">¥</text>
-                <text class="money" style="font-size: 34rpx">{{
+							<view class="weight" v-if="language == 'zh-CN'">{{ sku_info.item }} </view>
+							<view class="weight" v-if="language == 'en-US'">{{ sku_info.item_en }} </view>
+							<view class="weight" v-if="language == 'es-ES'">{{ sku_info.item_es }} </view>
+							<view class="weight" v-if="language == 'it-IT'">{{ sku_info.item_ita }} </view>
+							<!-- <view class="">{{Number(sku_info.weight)*value}}kg</view> -->
+						</view>
+						<view class="u-flex u-row-between">
+							<view class="">
+								<text class="money">¥</text>
+								<text class="money" style="font-size: 34rpx">{{
                   goodinfo.is_discount == 1
                     ? (Number(sku_info.price * 1000) * Number(value * 1000)) /
                       1000000
@@ -120,8 +103,8 @@
                         1000) /
                       1000000
                 }}</text>
-              </view>
-              <!-- 							<u-number-box @change="valChange" v-model="value">
+							</view>
+							<!-- 							<u-number-box @change="valChange" v-model="value">
 								<view slot="minus" class="">
 									<u-icon name="minus" size="12"></u-icon>
 								</view>
@@ -131,1194 +114,1080 @@
 									<u-icon name="plus" size="12"></u-icon>
 								</view>
 							</u-number-box> -->
-              <view class="">x{{ value }}</view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <!-- 物流 -->
-    <view class="logistics u-flex u-row-between">
-      <text style="font-weight: 600; width: 320rpx">{{ i18n.flow }}</text>
-      <view class="u-flex" @click="changwu">
-        <text class="change">{{
+							<view class="">x{{ value }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 物流 -->
+		<view class="logistics u-flex u-row-between">
+			<text style="font-weight: 600; width: 320rpx">{{ i18n.flow }}</text>
+			<view class="u-flex" @click="changwu">
+				<text class="change">{{
           containname1 ? type1 + " | " + containname1 : i18n.selection
         }}</text>
-        <u-icon name="arrow-right" size="16"></u-icon>
-      </view>
-    </view>
-    <!-- 推荐 -->
-    <view class="recommend">
-      <view class="top">
-        <image
-          v-if="language == 'zh-CN'"
-          src="static/images/recommend.png"
-          style="width: 124rpx; height: 30rpx"
-          mode=""
-        ></image>
-        <image
-          v-if="language == 'en-US'"
-          src="static/images/recommend1.png"
-          style="width: 378rpx; height: 30rpx"
-          mode=""
-        >
-        </image>
-        <image
-          v-if="language == 'es-ES'"
-          src="static/images/recommend2.png"
-          style="width: 550rpx; height: 30rpx"
-          mode=""
-        >
-        </image>
-        <image
-          v-if="language == 'it-IT'"
-          src="static/images/recommend3.png"
-          style="width: 460rpx; height: 30rpx"
-          mode=""
-        >
-        </image>
-      </view>
-      <view class="bottom">
-        <scroll-view
-          scroll-x
-          class="u-flex"
-          style="column: gap 28rpx; display: flex"
-        >
-          <view class="u-flex" style="column-gap: 16rpx">
-            <view
-              class=""
-              v-for="(item, idx) in swiptlist"
-              :key="idx"
-              @click="todetail(item.id)"
-            >
-              <image
-                :src="item.image"
-                style="width: 156rpx; height: 156rpx"
-                mode=""
-              >
-              </image>
-              <view class="title" v-if="language == 'zh-CN'">
-                {{ item.name_cn }}
-              </view>
-              <view class="title" v-if="language == 'en-US'">
-                {{ item.name_en }}
-              </view>
-              <view class="title" v-if="language == 'es-ES'">
-                {{ item.name_es }}
-              </view>
-              <view class="title" v-if="language == 'it-IT'">
-                {{ item.name_ita }}
-              </view>
-              <view class="money" style="color: #f83224; font-size: 20rpx">
-                <text>¥</text>
-                <text style="font-size: 28rpx">{{
+				<u-icon name="arrow-right" size="16"></u-icon>
+			</view>
+		</view>
+		<!-- 推荐 -->
+		<view class="recommend">
+			<view class="top">
+				<image v-if="language == 'zh-CN'" src="static/images/recommend.png" style="width: 124rpx; height: 30rpx"
+					mode=""></image>
+				<image v-if="language == 'en-US'" src="static/images/recommend1.png"
+					style="width: 378rpx; height: 30rpx" mode="">
+				</image>
+				<image v-if="language == 'es-ES'" src="static/images/recommend2.png"
+					style="width: 550rpx; height: 30rpx" mode="">
+				</image>
+				<image v-if="language == 'it-IT'" src="static/images/recommend3.png"
+					style="width: 460rpx; height: 30rpx" mode="">
+				</image>
+			</view>
+			<view class="bottom">
+				<scroll-view scroll-x class="u-flex" style="column: gap 28rpx; display: flex">
+					<view class="u-flex" style="column-gap: 16rpx">
+						<view class="" v-for="(item, idx) in swiptlist" :key="idx" @click="todetail(item.id)">
+							<image :src="item.image" style="width: 156rpx; height: 156rpx" mode="">
+							</image>
+							<view class="title" v-if="language == 'zh-CN'">
+								{{ item.name_cn }}
+							</view>
+							<view class="title" v-if="language == 'en-US'">
+								{{ item.name_en }}
+							</view>
+							<view class="title" v-if="language == 'es-ES'">
+								{{ item.name_es }}
+							</view>
+							<view class="title" v-if="language == 'it-IT'">
+								{{ item.name_ita }}
+							</view>
+							<view class="money" style="color: #f83224; font-size: 20rpx">
+								<text>¥</text>
+								<text style="font-size: 28rpx">{{
                   item.is_discount == 0
                     ? item.discount_price.slice(0, -3)
                     : item.price.slice(0, -3)
                 }}</text>
-                <text>{{
+								<text>{{
                   item.is_discount == 0
                     ? item.discount_price.slice(-3)
                     : item.price.slice(-3)
                 }}</text>
-              </view>
-            </view>
-          </view>
-        </scroll-view>
-      </view>
-    </view>
-    <!-- 商品相关 -->
-    <view class="abount" style="margin-top: 20rpx">
-      <view class="u-flex u-row-between" style="margin-bottom: 40rpx">
-        <view class="name">{{ i18n.Commodityamount }}</view>
-        <view class="" v-if="typea == 'shop'">{{ goodsPrice }}</view>
-        <view class="money" v-else>
-          ¥{{
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<!-- 商品相关 -->
+		<view class="abount" style="margin-top: 20rpx">
+			<view class="u-flex u-row-between" style="margin-bottom: 40rpx">
+				<view class="name">{{ i18n.Commodityamount }}</view>
+				<view class="" v-if="typea == 'shop'">{{ goodsPrice }}</view>
+				<view class="money" v-else>
+					¥{{
             goodinfo.is_discount == 1
               ? (Number(sku_info.price * 100) * Number(value * 100)) / 10000
               : (Number(sku_info.discount_price * 100) * Number(value * 100)) /
                 10000
           }}
-        </view>
-      </view>
-      <view class="u-flex u-row-between" v-show="containname1">
-        <view class="name">{{ i18n.Grosscommodityweight }}</view>
-        <!-- 				<view class="money" v-if="typea=='shop'">{{
+				</view>
+			</view>
+			<view class="u-flex u-row-between" v-show="containname1">
+				<view class="name">{{ i18n.Grosscommodityweight }}</view>
+				<!-- 				<view class="money" v-if="typea=='shop'">{{
 					goodsWeight
 				}}kg</view> -->
-        <!-- <view class="money" v-else>{{Number(sku_info.weight)*value}}kg</view> -->
-        <view class="money">{{ weight_total }}</view>
-      </view>
-      <view class="back u-flex" v-if="containname1">
-        <image
-          src="static/images/warning.png"
-          style="width: 32rpx; height: 32rpx"
-          mode=""
-        ></image>
-        <text style="margin-left: 12rpx; font-size: 24rpx"
-          >{{ i18n.buy }}{{ recommend_weight }}kg{{ i18n.price }}¥{{
+				<!-- <view class="money" v-else>{{Number(sku_info.weight)*value}}kg</view> -->
+				<view class="money">{{ weight_total }}</view>
+			</view>
+			<view class="back u-flex" v-if="containname1">
+				<image src="static/images/warning.png" style="width: 32rpx; height: 32rpx" mode=""></image>
+				<text
+					style="margin-left: 12rpx; font-size: 24rpx">{{ i18n.buy }}{{ recommend_weight }}kg{{ i18n.price }}¥{{
             unit_fee
-          }}，{{ i18n.morefavorable }}</text
-        >
-      </view>
-      <view
-        class="u-flex u-row-between"
-        style="margin-bottom: 40rpx; margin-top: 20rpx"
-      >
-        <view class="name">{{ i18n.Costperkilogram }}</view>
-        <view class="money">{{
+          }}，{{ i18n.morefavorable }}</text>
+			</view>
+			<view class="u-flex u-row-between" style="margin-bottom: 40rpx; margin-top: 20rpx">
+				<view class="name">{{ i18n.Costperkilogram }}</view>
+				<view class="money">{{
           containname1 ? unit_price : i18n.shippingmethod
         }}</view>
-      </view>
-      <view class="u-flex u-row-between">
-        <view class="name">{{ i18n.freight }}</view>
-        <view class="money">{{
+			</view>
+			<view class="u-flex u-row-between">
+				<view class="name">{{ i18n.freight }}</view>
+				<view class="money">{{
           containname1 ? sum : i18n.shippingmethod
         }}</view>
-      </view>
-      <view class="zong u-flex u-row-right">
-        <view class="">
-          <text class="small">{{ i18n.subtotal }}</text>
-          <text class="mon">¥</text>
-          <text class="mon" v-if="typea == 'shop'">{{ goodsPrice }}</text>
-          <text class="mon" v-else style="font-size: 40rpx">{{
+			</view>
+			<view class="zong u-flex u-row-right">
+				<view class="">
+					<text class="small">{{ i18n.subtotal }}</text>
+					<text class="mon">¥</text>
+					<text class="mon" v-if="typea == 'shop'">{{ goodsPrice }}</text>
+					<text class="mon" v-else style="font-size: 40rpx">{{
             goodinfo.is_discount == 1
               ? (Number(sku_info.price * 100) * Number(value * 100)) / 10000
               : (Number(sku_info.discount_price * 100) * Number(value * 100)) /
                 10000
           }}</text>
-        </view>
-      </view>
-    </view>
-    <view class="" style="height: 166rpx"></view>
-    <view class="btn u-flex u-row-right">
-      <view class="u-flex">
-        <!-- 				<text v-if="typea == 'shop'">{{i18n.Atotalof}}{{goodsWeight}}kg,</text>
+				</view>
+			</view>
+		</view>
+		<view class="" style="height: 166rpx"></view>
+		<view class="btn u-flex u-row-right">
+			<view class="u-flex">
+				<!-- 				<text v-if="typea == 'shop'">{{i18n.Atotalof}}{{goodsWeight}}kg,</text>
 				<text v-else class="kg">{{i18n.Atotalof}}{{Number(sku_info.weight) * value}}kg,</text> -->
-        <text class="kg" v-show="containname1"
-          >{{ i18n.Atotalof }}{{ weight_total }}kg,</text
-        >
-        <text>{{ i18n.total }}:</text>
-        <text class="money" style="font-size: 28rpx">¥</text>
-        <text style="font-weight: bold" class="money" v-if="typea == 'shop'">{{
+				<text class="kg" v-show="containname1">{{ i18n.Atotalof }}{{ weight_total }}kg,</text>
+				<text>{{ i18n.total }}:</text>
+				<text class="money" style="font-size: 28rpx">¥</text>
+				<text style="font-weight: bold" class="money" v-if="typea == 'shop'">{{
           Number(sum * 10000 + Number(goodsPrice) * 10000) / 10000
         }}</text>
-        <view class="" v-else>
-          <text
-            class="money"
-            v-if="goodinfo.is_discount == 1"
-            style="font-weight: bold"
-            >{{
+				<view class="" v-else>
+					<text class="money" v-if="goodinfo.is_discount == 1" style="font-weight: bold">{{
               Number(
                 sum * 10000 + Number(sku_info.price) * Number(value) * 10000
               ) / 10000
-            }}</text
-          >
-          <text
-            class="money"
-            v-if="goodinfo.is_discount == 0"
-            style="font-weight: bold"
-            >{{
+            }}</text>
+					<text class="money" v-if="goodinfo.is_discount == 0" style="font-weight: bold">{{
               Number(
                 sum * 10000 +
                   Number(sku_info.discount_price) * Number(value) * 10000
               ) / 10000
-            }}</text
-          >
-        </view>
-      </view>
-      <view class="order" @click="topay">
-        {{ i18n.Submitorder }}
-      </view>
-    </view>
-    <!-- 跨境物流 -->
-    <u-popup
-      :show="show"
-      @close="close"
-      mode="bottom"
-      closeIconPos="top-right"
-      round="28"
-    >
-      <view style="padding: 40rpx 28rpx; box-sizing: border-box">
-        <view class="u-flex u-row-between">
-          <view class="" style="width: 28px; height: 28px"></view>
-          <view class="poptitle">
-            {{ i18n.flow }}
-          </view>
-          <u-icon
-            name="close"
-            @click="close"
-            color="background: #333333;"
-            size="28"
-          ></u-icon>
-        </view>
-        <view
-          class="u-flex"
-          style="margin-top: 60rpx; flex-wrap: wrap; column-gap: 16rpx"
-        >
-          <view
-            :class="index == idx ? 'active' : 'unactive'"
-            v-for="(item, idx) in containerList"
-            @click="change(item, idx)"
-            style="
+            }}</text>
+				</view>
+			</view>
+			<view class="order" @click="topay">
+				{{ i18n.Submitorder }}
+			</view>
+		</view>
+		<!-- 跨境物流 -->
+		<u-popup :show="show" @close="close" mode="bottom" closeIconPos="top-right" round="28">
+			<view style="padding: 40rpx 28rpx; box-sizing: border-box">
+				<view class="u-flex u-row-between">
+					<view class="" style="width: 28px; height: 28px"></view>
+					<view class="poptitle">
+						{{ i18n.flow }}
+					</view>
+					<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
+				</view>
+				<view class="u-flex" style="margin-top: 60rpx; flex-wrap: wrap; column-gap: 16rpx">
+					<view :class="index == idx ? 'active' : 'unactive'" v-for="(item, idx) in containerList"
+						@click="change(item, idx)" style="
               display: flex;
               flex-direction: column;
               align-items: center;
               justify-content: center;
               margin-bottom: 28rpx;
               position: relative;
-            "
-          >
-            <image
-              v-if="index == idx"
-              src="static/images/change.png"
-              style="
+            ">
+						<image v-if="index == idx" src="static/images/change.png" style="
                 width: 36rpx;
                 height: 32rpx;
                 position: absolute;
                 top: 0;
                 right: 0;
-              "
-              mode=""
-            ></image>
-            <view class="logname" v-if="language == 'zh-CN'">{{
+              " mode=""></image>
+						<view class="logname" v-if="language == 'zh-CN'">{{
               item.name_cn
             }}</view>
-            <view class="logname" v-if="language == 'en-US'">{{
+						<view class="logname" v-if="language == 'en-US'">{{
               item.name_en
             }}</view>
-            <view class="logname" v-if="language == 'es-ES'">{{
+						<view class="logname" v-if="language == 'es-ES'">{{
               item.name_es
             }}</view>
-            <view class="logname" v-if="language == 'it-IT'">{{
+						<view class="logname" v-if="language == 'it-IT'">{{
               item.name_ita
             }}</view>
-            <!-- 						<view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view> -->
-            <view class="wei" style="font-size: 32rpx; font-weight: 600"
-              >¥{{ item.unit_price }}/kg</view
-            >
-          </view>
-        </view>
-        <view class="nextto" @click="next">{{ i18n.next }}</view>
-      </view>
-    </u-popup>
-    <!-- 跨境物流下一步 -->
-    <u-popup
-      :safeAreaInsetTop="true"
-      :show="show1"
-      @close="close"
-      mode="bottom"
-      closeIconPos="top-right"
-      round="28"
-      bgColor="#F4F4F4"
-    >
-      <view
-        style="padding: 40rpx 28rpx; box-sizing: border-box; position: relative"
-      >
-        <view class="u-flex u-row-between">
-          <view class="" style="width: 28px; height: 28px"></view>
-          <view class="poptitle">
-            {{ i18n.flow }}
-          </view>
-          <u-icon
-            name="close"
-            @click="close"
-            color="background: #333333;"
-            size="28"
-          ></u-icon>
-        </view>
-        <scroll-view :scroll-y="true" style="500rpx">
-          <view
-            class="transport"
-            style="margin-top: 32rpx"
-            @click="activea(item, idx)"
-            v-for="(item, idx) in containlist"
-            v-if="item.sum != 0"
-          >
-            <view class="u-flex u-row-between">
-              <text class="yundate"
-                >{{ i18n.Shipmentdate }} {{ item.end_date }}</text
-              >
-              <image
-                v-if="datechan == idx"
-                src="/pageA/static/images/active.png"
-                style="width: 36rpx; height: 36rpx"
-                mode=""
-              ></image>
-              <image
-                v-else
-                src="/pageA/static/images/unactive.png"
-                style="width: 36rpx; height: 36rpx"
-                mode=""
-              ></image>
-            </view>
-            <view class="u-flex u-row-between" style="margin-top: 28rpx">
-              <view class="chest">
-                <text v-if="language == 'zh-CN'">{{ item.name_cn }}</text>
-                <text v-if="language == 'en-US'">{{ item.name_en }}</text>
-                <text v-if="language == 'es-ES'">{{ item.name_es }}</text>
-                <text v-if="language == 'it-IT'">{{ item.name_ita }}</text>
-                <text style="margin: 0 16rpx">|</text>
-                <text
-                  >{{ i18n.Estimatedtimeofarrival }}{{ item.transport_days
-                  }}{{ i18n.Workingday }}</text
-                >
-              </view>
-              <view class="mone">
-                <text>¥</text>
-                <text style="font-size: 48rpx; font-weight: 600">{{
+						<!-- 						<view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view> -->
+						<view class="wei" style="font-size: 32rpx; font-weight: 600">¥{{ item.unit_price }}/kg</view>
+					</view>
+				</view>
+				<view class="nextto" @click="next">{{ i18n.next }}</view>
+			</view>
+		</u-popup>
+		<!-- 跨境物流下一步 -->
+		<u-popup :safeAreaInsetTop="true" :show="show1" @close="close" mode="bottom" closeIconPos="top-right" round="28"
+			bgColor="#F4F4F4">
+			<view style="padding: 40rpx 28rpx; box-sizing: border-box; position: relative">
+				<view class="u-flex u-row-between">
+					<view class="" style="width: 28px; height: 28px"></view>
+					<view class="poptitle">
+						{{ i18n.flow }}
+					</view>
+					<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
+				</view>
+				<scroll-view :scroll-y="true" style="500rpx">
+					<view class="transport" style="margin-top: 32rpx" @click="activea(item, idx)"
+						v-for="(item, idx) in containlist" v-if="item.sum != 0">
+						<view class="u-flex u-row-between">
+							<text class="yundate">{{ i18n.Shipmentdate }} {{ item.end_date }}</text>
+							<image v-if="datechan == idx" src="/pageA/static/images/active.png"
+								style="width: 36rpx; height: 36rpx" mode=""></image>
+							<image v-else src="/pageA/static/images/unactive.png" style="width: 36rpx; height: 36rpx"
+								mode=""></image>
+						</view>
+						<view class="u-flex u-row-between" style="margin-top: 28rpx">
+							<view class="chest">
+								<text v-if="language == 'zh-CN'">{{ item.name_cn }}</text>
+								<text v-if="language == 'en-US'">{{ item.name_en }}</text>
+								<text v-if="language == 'es-ES'">{{ item.name_es }}</text>
+								<text v-if="language == 'it-IT'">{{ item.name_ita }}</text>
+								<text style="margin: 0 16rpx">|</text>
+								<text>{{ i18n.Estimatedtimeofarrival }}{{ item.transport_days
+                  }}{{ i18n.Workingday }}</text>
+							</view>
+							<view class="mone">
+								<text>¥</text>
+								<text style="font-size: 48rpx; font-weight: 600">{{
                   item.sum
                 }}</text>
-              </view>
-            </view>
-          </view>
-        </scroll-view>
-        <view class="" style="height: 166rpx"></view>
-        <view class="enbottom u-flex u-row-between">
-          <view class="cancel" @click="close">{{ i18n.Cancel }}</view>
-          <view class="confirm" @click="confirm">{{ i18n.enter }}</view>
-        </view>
-      </view>
-    </u-popup>
-  </view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="" style="height: 166rpx"></view>
+				<view class="enbottom u-flex u-row-between">
+					<view class="cancel" @click="close">{{ i18n.Cancel }}</view>
+					<view class="confirm" @click="confirm">{{ i18n.enter }}</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      value: 1,
-      show: false,
-      index: "",
-      show1: false,
-      datechan: "",
-      sku_info: {},
-      goodinfo: {},
-      swiptlist: [], //推荐列表
-      language: "zh-CN",
-      containerList: [], //列表
-      province_id: "",
-      transport_type_id: "",
-      containlist: [],
-      containid: "", //货柜id
-      containname: "", //货柜名称
-      type: "", //货运方式名称
-      containname1: "",
-      type1: "",
-      sum: "",
-      unit_price: "",
-      recommend_weight: "",
-      sum1: "",
-      unit_price1: "",
-      recommend_weight1: "",
-      max_weight: "",
-      min_weight: "",
-      unit_fee: "",
-      addinfo: "",
-      huoid: "",
-      selelist: [],
-      typea: "",
-      goodsPrice: "",
-      goodsWeight: "",
-      stringcheck: "",
-      cartid: "",
-      weight_total: "",
-      valuenum: false,
-    };
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  onLoad(options) {
-    // url: '/pageA/order?sku=' + this.sku_info + '&value=' + this.value+'&goodinfo='+this.goodinfo
-    if (options.typea) {
-      this.typea = options.typea;
-      this.selelist = JSON.parse(decodeURIComponent(options.selelist));
-      console.log(this.selelist);
-      this.goodsPrice = options.goodsPrice;
-      this.goodsWeight = options.goodsWeight;
-      this.stringcheck = options.stringcheck;
-      this.cartid = options.cartid;
-    } else if (options) {
-      this.value = options.value;
-      this.sku_info = JSON.parse(decodeURIComponent(options.sku));
-      this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo));
-      if (options.share_merchant_id) {
-        this.share_merchant_id = options.share_merchant_id;
-      }
-    }
-  },
-  onShow() {
-    if (uni.getStorageSync("language") != "") {
-      this.language = uni.getStorageSync("language");
-    }
-    this.recommend();
-    // this.container()
-  },
-  methods: {
-    changwu() {
-      if (this.addinfo) {
-        this.show = true;
-      } else {
-        this.$u.toast(this.i18n.shippingaddress);
-      }
-    },
-    valChange() {
-      this.valuenum = true;
-    },
-    todetail(id) {
-      uni.navigateTo({
-        url: "/pageA/productdetails?id=" + id,
-      });
-    },
-    //正则匹配手机号
-    replacePhoneToStar: function (phone) {
-      if (phone) {
-        return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
-      }
-    },
-    //推荐重量
-    recommendweight() {
-      uni.$u.http
-        .get("/api/express-order/recommend-container", {
-          params: {
-            container_id: this.containid,
-            type: this.goodinfo.cate == 0 ? "normal" : "special",
-          },
-        })
-        .then((res) => {
-          console.log(res);
-          this.max_weight = res.max_weight;
-          this.min_weight = res.min_weight;
-          this.unit_fee = res.unit_fee;
-        })
-        .catch(() => {});
-    },
-    //货运类型列表
-    transport() {
-      uni.$u.http
-        .get("/api/transport-type", {
-          params: {
-            province_id: this.province_id,
-          },
-        })
-        .then((res) => {
-          this.containerList = res;
-          this.transport_type_id = res[0].id;
-          if (this.language == "zh-CN") {
-            this.type = res[0].name_cn;
-          }
-          if (this.language == "en-US") {
-            this.type = res[0].name_en;
-          }
-          if (this.language == "es-ES") {
-            this.type = res[0].name_es;
-          }
-          if (this.language == "it-IT") {
-            this.type = res[0].name_ita;
-          }
-        })
-        .catch(() => {});
-    },
-    //跳转到填写地址
-    toadd() {
-      var that = this;
-      uni.navigateTo({
-        url: "/pageC/addressManagement/addressManagement?tabs=" + Number(0),
-        events: {
-          getadd(res) {
-            that.addinfo = res;
-            that.province_id = res.province_id;
-            that.transport();
-          },
-        },
-      });
-    },
-    //货柜列表
-    container() {
-      this.containlist = [];
-      uni.$u.http
-        .get("/api/container-base", {
-          params: {
-            is_page: 0,
-            province_id: this.province_id,
-            transport_type_id: this.transport_type_id,
-            weight:
-              this.typea == "shop"
-                ? ""
-                : Number(this.sku_info.weight) * this.value,
-            type:
-              this.typea == "shop"
-                ? ""
-                : this.goodinfo.cate == 0
-                ? "normal"
-                : "special",
-            length:
-              this.typea == "shop"
-                ? ""
-                : Number(this.sku_info.length) * this.value, //		是	String	长
-            width: this.sku_info.width, //		是	String	宽
-            height: this.sku_info.height, //		是	String	高
-            cart_id: this.cartid,
-            // cart_id: '147,148'
-          },
-        })
-        .then((res) => {
-          res.forEach((item) => {
-            if (item.sum != 0) {
-              this.containlist.push(item);
-            }
-            console.log(this.containlist);
-          });
-          if (this.cartid.length == 0 && this.typea == "shop") {
-            console.log("his.cartid.length", this.cartid.length);
-            this.sum = 0;
-          }
-          // this.sum = this.containlist[0].sum
-          // this.unit_price = this.containlist[0].unit_price
-          if (this.goodinfo.is_shipping == 0) {
-            this.sum = 0;
-          } else {
-            this.sum = this.containlist[0].sum;
-          }
-          if (this.goodinfo.is_shipping == 0) {
-            this.unit_price = 0;
-          } else {
-            this.unit_price = this.containlist[0].unit_price;
-          }
-          this.recommend_weight = this.containlist[0].recommend_weight;
-          this.weight_total = this.containlist[0].weight_total;
-          this.containid = this.containlist[0].id;
-          if (this.language == "zh-CN") {
-            this.containname = this.containlist[0].name_cn;
-          }
-          if (this.language == "en-US") {
-            this.containname = this.containlist[0].name_en;
-          }
-          if (this.language == "es-ES") {
-            this.containname = this.containlist[0].name_es;
-          }
-          if (this.language == "it-IT") {
-            this.containname = this.containlist[0].name_ita;
-          }
-        })
-        .catch(() => {});
-    },
-    //运费满减
-    config() {
-      var that = this;
-      uni.$u.http
-        .get("/api/config", {
-          params: {
-            module: "free_shipping",
-          },
-        })
-        .then((res) => {
-          if (
-            Number(that.goodsPrice) > res.free_shipping &&
-            that.typea == "shop"
-          ) {
-            console.log("goodsPrice", that.goodsPrice);
-            console.log("res.free_shipping", res.free_shipping);
-            that.sum = 0;
-            that.unit_price = 0;
-          }
-          let goodsum = "";
-          if (that.goodinfo.is_discount == 1) {
-            goodsum =
-              (Number(that.sku_info.price * 100) * Number(that.value * 100)) /
-              10000;
-            console.log("that.sum", that.sum);
-            console.log("that.goodsum", goodsum);
-            if (goodsum > res.free_shipping) {
-              that.sum = 0;
-              that.unit_price = 0;
-            }
-          } else {
-            goodsum =
-              (Number(that.sku_info.discount_price * 100) *
-                Number(that.value * 100)) /
-              10000;
-            if (goodsum > res.free_shipping) {
-              that.sum = 0;
-              that.unit_price = 0;
-            }
-          }
-        })
-        .catch(() => {});
-    },
-    //商品推荐
-    recommend() {
-      uni.$u.http
-        .post("/api/goods/recommend", {
-          keyword: "",
-        })
-        .then((res) => {
-          this.swiptlist = res;
-        })
-        .catch(() => {});
-    },
-    change(item, index) {
-      this.transport_type_id = item.id;
-      this.index = index;
-      if (this.language == "zh-CN") {
-        this.type = item.name_cn;
-      }
-      if (this.language == "en-US") {
-        this.type = item.name_en;
-      }
-      if (this.language == "es-ES") {
-        this.type = item.name_es;
-      }
-      if (this.language == "it-IT") {
-        this.type = item.name_ita;
-      }
-    },
-    next() {
-      this.show = false;
-      this.show1 = true;
-      this.type1 = this.type;
-      this.container();
-    },
-    activea(item, idx) {
-      this.datechan = idx;
-      this.sum = item.sum;
-      this.unit_price = item.unit_price;
-      this.recommend_weight = item.recommend_weight;
-      this.containid = item.id;
-      this.weight_total = item.weight_total;
-      if (this.language == "zh-CN") {
-        this.containname = item.name_cn;
-      }
-      if (this.language == "en-US") {
-        this.containname = item.name_en;
-      }
-      if (this.language == "es-ES") {
-        this.containname = item.name_es;
-      }
-      if (this.language == "it-IT") {
-        this.containname = item.name_ita;
-      }
-    },
-    //确定
-    confirm() {
-      this.valuenum = false;
-      this.show1 = false;
-      this.containname1 = this.containname;
-      this.recommendweight();
-      this.config();
-    },
-    // 取消
-    close() {
-      this.show = false;
-      this.show1 = false;
-    },
-    //提交订单
-    topay() {
-      if (this.valuenum) {
-        this.$u.toast(this.i18n.newcontainer);
-      } else {
-        uni.$u.http
-          .post("/api/order", {
-            address_id: this.addinfo.id, //3	是	String	地址ID
-            goods_id: this.goodinfo.id, //65	是	String	商品id
-            goods_num: this.value, //2	是	String	商品数量
-            sku_item_id: this.sku_info.id, //60	是	String	规格id
-            cart_ids: this.stringcheck, //8,9	是	String	购物车id
-            remark: "", //备注	是	String	备注
-            merchant_goods_id: this.goodinfo.merchant_goods_id || "", //39	是	String	团长商品id
-            container_id: this.containid, //1	是	String	货柜id
-            share_member_id: this.share_merchant_id, //	是	String	分享团长id 分享商品的时候传
-            belong: this.goodinfo.source || "", //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
-          })
-          .then((res) => {
-            console.log("share_merchant_id", this.share_merchant_id);
-            console.log(res);
-            uni.navigateTo({
-              // url: '/pageA/payorder?sum=' + (Number(this.sum*10000+ Number(this.sku_info.discount_price)*Number(this.value)*10000))/10000 +'&orderid=' + res.id
-              url: "/pageA/payorder?orderid=" + res.id + "&sum=" + res.amount,
-            });
-          })
-          .catch(() => {});
-      }
-    },
-  },
-};
+	export default {
+		data() {
+			return {
+				value: 1,
+				show: false,
+				index: "",
+				show1: false,
+				datechan: "",
+				sku_info: {},
+				goodinfo: {},
+				swiptlist: [], //推荐列表
+				language: "zh-CN",
+				containerList: [], //列表
+				province_id: "",
+				transport_type_id: "",
+				containlist: [],
+				containid: "", //货柜id
+				containname: "", //货柜名称
+				type: "", //货运方式名称
+				containname1: "",
+				type1: "",
+				sum: "",
+				unit_price: "",
+				recommend_weight: "",
+				sum1: "",
+				unit_price1: "",
+				recommend_weight1: "",
+				max_weight: "",
+				min_weight: "",
+				unit_fee: "",
+				addinfo: "",
+				huoid: "",
+				selelist: [],
+				typea: "",
+				goodsPrice: "",
+				goodsWeight: "",
+				stringcheck: "",
+				cartid: "",
+				weight_total: "",
+				valuenum: false,
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		onLoad(options) {
+			// url: '/pageA/order?sku=' + this.sku_info + '&value=' + this.value+'&goodinfo='+this.goodinfo
+			if (options.typea) {
+				this.typea = options.typea;
+				this.selelist = JSON.parse(decodeURIComponent(options.selelist));
+				console.log(this.selelist);
+				this.goodsPrice = options.goodsPrice;
+				this.goodsWeight = options.goodsWeight;
+				this.stringcheck = options.stringcheck;
+				this.cartid = options.cartid;
+			} else if (options) {
+				this.value = options.value;
+				this.sku_info = JSON.parse(decodeURIComponent(options.sku));
+				this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo));
+				if (options.share_merchant_id) {
+					this.share_merchant_id = options.share_merchant_id;
+				}
+			}
+		},
+		onShow() {
+			if (uni.getStorageSync("language") != "") {
+				this.language = uni.getStorageSync("language");
+			}
+			this.recommend();
+			// this.container()
+		},
+		methods: {
+			changwu() {
+				if (this.addinfo) {
+					this.show = true;
+				} else {
+					this.$u.toast(this.i18n.shippingaddress);
+				}
+			},
+			valChange() {
+				this.valuenum = true;
+			},
+			todetail(id) {
+				uni.navigateTo({
+					url: "/pageA/productdetails?id=" + id,
+				});
+			},
+			//正则匹配手机号
+			replacePhoneToStar: function(phone) {
+				if (phone) {
+					return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
+				}
+			},
+			//推荐重量
+			recommendweight() {
+				uni.$u.http
+					.get("/api/express-order/recommend-container", {
+						params: {
+							container_id: this.containid,
+							type: this.goodinfo.cate == 0 ? "normal" : "special",
+						},
+					})
+					.then((res) => {
+						console.log(res);
+						this.max_weight = res.max_weight;
+						this.min_weight = res.min_weight;
+						this.unit_fee = res.unit_fee;
+					})
+					.catch(() => {});
+			},
+			//货运类型列表
+			transport() {
+				uni.$u.http
+					.get("/api/transport-type", {
+						params: {
+							province_id: this.province_id,
+						},
+					})
+					.then((res) => {
+						this.containerList = res;
+						this.transport_type_id = res[0].id;
+						if (this.language == "zh-CN") {
+							this.type = res[0].name_cn;
+						}
+						if (this.language == "en-US") {
+							this.type = res[0].name_en;
+						}
+						if (this.language == "es-ES") {
+							this.type = res[0].name_es;
+						}
+						if (this.language == "it-IT") {
+							this.type = res[0].name_ita;
+						}
+					})
+					.catch(() => {});
+			},
+			//跳转到填写地址
+			toadd() {
+				var that = this;
+				uni.navigateTo({
+					url: "/pageC/addressManagement/addressManagement?tabs=" + Number(0),
+					events: {
+						getadd(res) {
+							that.addinfo = res;
+							that.province_id = res.province_id;
+							that.transport();
+						},
+					},
+				});
+			},
+			//货柜列表
+			container() {
+				this.containlist = [];
+				uni.$u.http
+					.get("/api/container-base", {
+						params: {
+							is_page: 0,
+							province_id: this.province_id,
+							transport_type_id: this.transport_type_id,
+							weight: this.typea == "shop" ?
+								"" : Number(this.sku_info.weight) * this.value,
+							type: this.typea == "shop" ?
+								"" : this.goodinfo.cate == 0 ?
+								"normal" : "special",
+							length: this.typea == "shop" ?
+								"" : Number(this.sku_info.length) * this.value, //		是	String	长
+							width: this.sku_info.width, //		是	String	宽
+							height: this.sku_info.height, //		是	String	高
+							cart_id: this.cartid,
+							// cart_id: '147,148'
+						},
+					})
+					.then((res) => {
+						res.forEach((item) => {
+							if (item.sum != 0) {
+								this.containlist.push(item);
+							}
+							console.log(this.containlist);
+						});
+						if (this.cartid.length == 0 && this.typea == "shop") {
+							console.log("his.cartid.length", this.cartid.length);
+							this.sum = 0;
+						}
+						// this.sum = this.containlist[0].sum
+						// this.unit_price = this.containlist[0].unit_price
+						if (this.goodinfo.is_shipping == 0) {
+							this.sum = 0;
+						} else {
+							this.sum = this.containlist[0].sum;
+						}
+						if (this.goodinfo.is_shipping == 0) {
+							this.unit_price = 0;
+						} else {
+							this.unit_price = this.containlist[0].unit_price;
+						}
+						this.recommend_weight = this.containlist[0].recommend_weight;
+						this.weight_total = this.containlist[0].weight_total;
+						this.containid = this.containlist[0].id;
+						if (this.language == "zh-CN") {
+							this.containname = this.containlist[0].name_cn;
+						}
+						if (this.language == "en-US") {
+							this.containname = this.containlist[0].name_en;
+						}
+						if (this.language == "es-ES") {
+							this.containname = this.containlist[0].name_es;
+						}
+						if (this.language == "it-IT") {
+							this.containname = this.containlist[0].name_ita;
+						}
+					})
+					.catch(() => {});
+			},
+			//运费满减
+			config() {
+				var that = this;
+				uni.$u.http
+					.get("/api/config", {
+						params: {
+							module: "free_shipping",
+						},
+					})
+					.then((res) => {
+						if (
+							Number(that.goodsPrice) > res.free_shipping &&
+							that.typea == "shop"
+						) {
+							console.log("goodsPrice", that.goodsPrice);
+							console.log("res.free_shipping", res.free_shipping);
+							that.sum = 0;
+							that.unit_price = 0;
+						}
+						let goodsum = "";
+						if (that.goodinfo.is_discount == 1) {
+							goodsum =
+								(Number(that.sku_info.price * 100) * Number(that.value * 100)) /
+								10000;
+							console.log("that.sum", that.sum);
+							console.log("that.goodsum", goodsum);
+							if (goodsum > res.free_shipping) {
+								that.sum = 0;
+								that.unit_price = 0;
+							}
+						} else {
+							goodsum =
+								(Number(that.sku_info.discount_price * 100) *
+									Number(that.value * 100)) /
+								10000;
+							if (goodsum > res.free_shipping) {
+								that.sum = 0;
+								that.unit_price = 0;
+							}
+						}
+					})
+					.catch(() => {});
+			},
+			//商品推荐
+			recommend() {
+				uni.$u.http
+					.post("/api/goods/recommend", {
+						keyword: "",
+					})
+					.then((res) => {
+						this.swiptlist = res;
+					})
+					.catch(() => {});
+			},
+			change(item, index) {
+				this.transport_type_id = item.id;
+				this.index = index;
+				if (this.language == "zh-CN") {
+					this.type = item.name_cn;
+				}
+				if (this.language == "en-US") {
+					this.type = item.name_en;
+				}
+				if (this.language == "es-ES") {
+					this.type = item.name_es;
+				}
+				if (this.language == "it-IT") {
+					this.type = item.name_ita;
+				}
+			},
+			next() {
+				this.show = false;
+				this.show1 = true;
+				this.type1 = this.type;
+				this.container();
+			},
+			activea(item, idx) {
+				this.datechan = idx;
+				this.sum = item.sum;
+				this.unit_price = item.unit_price;
+				this.recommend_weight = item.recommend_weight;
+				this.containid = item.id;
+				this.weight_total = item.weight_total;
+				if (this.language == "zh-CN") {
+					this.containname = item.name_cn;
+				}
+				if (this.language == "en-US") {
+					this.containname = item.name_en;
+				}
+				if (this.language == "es-ES") {
+					this.containname = item.name_es;
+				}
+				if (this.language == "it-IT") {
+					this.containname = item.name_ita;
+				}
+			},
+			//确定
+			confirm() {
+				this.valuenum = false;
+				this.show1 = false;
+				this.containname1 = this.containname;
+				this.recommendweight();
+				this.config();
+			},
+			// 取消
+			close() {
+				this.show = false;
+				this.show1 = false;
+			},
+			//提交订单
+			topay() {
+				if (this.valuenum) {
+					this.$u.toast(this.i18n.newcontainer);
+				} else {
+					uni.$u.http
+						.post("/api/order", {
+							address_id: this.addinfo.id, //3	是	String	地址ID
+							goods_id: this.goodinfo.id, //65	是	String	商品id
+							goods_num: this.value, //2	是	String	商品数量
+							sku_item_id: this.sku_info.id, //60	是	String	规格id
+							cart_ids: this.stringcheck, //8,9	是	String	购物车id
+							remark: "", //备注	是	String	备注
+							merchant_goods_id: this.goodinfo.merchant_goods_id || "", //39	是	String	团长商品id
+							container_id: this.containid, //1	是	String	货柜id
+							share_member_id: this.share_merchant_id, //	是	String	分享团长id 分享商品的时候传
+							belong: this.goodinfo.source || "", //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
+						})
+						.then((res) => {
+							console.log("share_merchant_id", this.share_merchant_id);
+							console.log(res);
+							uni.navigateTo({
+								// url: '/pageA/payorder?sum=' + (Number(this.sum*10000+ Number(this.sku_info.discount_price)*Number(this.value)*10000))/10000 +'&orderid=' + res.id
+								url: "/pageA/payorder?orderid=" + res.id + "&sum=" + res.amount,
+							});
+						})
+						.catch(() => {});
+				}
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.toptitle {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  // font-size: 22rpx;
-  color: #222222;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-  // width: 148rpx;
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 1;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  word-break: break-all;
-}
+	.toptitle {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		// font-size: 22rpx;
+		color: #222222;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+		// width: 148rpx;
+		width: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		-webkit-line-clamp: 1;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		word-break: break-all;
+	}
 
-::v-deep .u-status-bar {
-  height: 0 !important;
-}
+	::v-deep .u-status-bar {
+		height: 0 !important;
+	}
 
-.confirm {
-  width: 398rpx;
-  height: 84rpx;
-  background: #f83224;
-  border-radius: 42rpx;
-  text-align: center;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #ffffff;
-  line-height: 84rpx;
-  text-align: center;
-  font-style: normal;
-}
+	.confirm {
+		width: 398rpx;
+		height: 84rpx;
+		background: #f83224;
+		border-radius: 42rpx;
+		text-align: center;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #ffffff;
+		line-height: 84rpx;
+		text-align: center;
+		font-style: normal;
+	}
 
-.cancel {
-  width: 280rpx;
-  height: 84rpx;
-  border-radius: 42rpx;
-  border: 2rpx solid rgba(151, 151, 151, 0.3);
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 32rpx;
-  color: #444444;
-  line-height: 84rpx;
-  text-align: center;
-  font-style: normal;
-}
+	.cancel {
+		width: 280rpx;
+		height: 84rpx;
+		border-radius: 42rpx;
+		border: 2rpx solid rgba(151, 151, 151, 0.3);
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #444444;
+		line-height: 84rpx;
+		text-align: center;
+		font-style: normal;
+	}
 
-.enbottom {
-  width: 750rpx;
-  height: 166rpx;
-  background: #ffffff;
-  position: absolute;
-  left: 0rpx;
-  bottom: 0;
-  padding: 0 24rpx;
-  box-sizing: border-box;
-}
+	.enbottom {
+		width: 750rpx;
+		height: 166rpx;
+		background: #ffffff;
+		position: absolute;
+		left: 0rpx;
+		bottom: 0;
+		padding: 0 24rpx;
+		box-sizing: border-box;
+	}
 
-.mone {
-  font-family: JDZhengHT, JDZhengHT;
-  font-weight: 400;
-  font-size: 26rpx;
-  color: #f83224;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.mone {
+		font-family: JDZhengHT, JDZhengHT;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #f83224;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.yundate {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 550;
-  font-size: 32rpx;
-  color: #333333;
-  line-height: 44rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.yundate {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 550;
+		font-size: 32rpx;
+		color: #333333;
+		line-height: 44rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.chest {
-  font-family: SFPro, SFPro;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #555555;
-  line-height: 28rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.chest {
+		font-family: SFPro, SFPro;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #555555;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.act {
-  width: 702rpx;
-  height: 164rpx;
-  background: #ffffff;
-  border-radius: 12rpx;
-  padding: 24rpx 20rpx;
-  box-sizing: border-box;
-  border: 1rpx solid #f83224;
-}
+	.act {
+		width: 702rpx;
+		height: 164rpx;
+		background: #ffffff;
+		border-radius: 12rpx;
+		padding: 24rpx 20rpx;
+		box-sizing: border-box;
+		border: 1rpx solid #f83224;
+	}
 
-.transport {
-  width: 702rpx;
-  height: 164rpx;
-  background: #ffffff;
-  border-radius: 12rpx;
-  padding: 24rpx 20rpx;
-  box-sizing: border-box;
-}
+	.transport {
+		width: 702rpx;
+		height: 164rpx;
+		background: #ffffff;
+		border-radius: 12rpx;
+		padding: 24rpx 20rpx;
+		box-sizing: border-box;
+	}
 
-.nextto {
-  width: 702rpx;
-  height: 84rpx;
-  background: #f83224;
-  border-radius: 44rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #ffffff;
-  line-height: 84rpx;
-  text-align: center;
-  font-style: normal;
-  margin-top: 108rpx;
-}
+	.nextto {
+		width: 702rpx;
+		height: 84rpx;
+		background: #f83224;
+		border-radius: 44rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #ffffff;
+		line-height: 84rpx;
+		text-align: center;
+		font-style: normal;
+		margin-top: 108rpx;
+	}
 
-.logname {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #333333;
-  line-height: 40rpx;
-  text-align: right;
-  font-style: normal;
-  overflow: hidden;
-  width: 220rpx;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  text-align: center;
-  word-break: break-all;
-}
+	.logname {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #333333;
+		line-height: 40rpx;
+		text-align: right;
+		font-style: normal;
+		overflow: hidden;
+		width: 220rpx;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		text-align: center;
+		word-break: break-all;
+	}
 
-.wei {
-  font-family: JDZhengHT, JDZhengHT;
-  font-weight: 400;
-  font-size: 32rpx;
-  color: #f83224;
-  line-height: 40rpx;
-  text-align: right;
-  font-style: normal;
-  margin-top: 8rpx;
-}
+	.wei {
+		font-family: JDZhengHT, JDZhengHT;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #f83224;
+		line-height: 40rpx;
+		text-align: right;
+		font-style: normal;
+		margin-top: 8rpx;
+	}
 
-.active {
-  width: 218rpx;
-  height: 148rpx;
-  background: rgba(247, 50, 36, 0.05);
-  border-radius: 8rpx;
-  border: 1rpx solid #f83224;
-}
+	.active {
+		width: 218rpx;
+		height: 148rpx;
+		background: rgba(247, 50, 36, 0.05);
+		border-radius: 8rpx;
+		border: 1rpx solid #f83224;
+	}
 
-.unactive {
-  width: 218rpx;
-  height: 148rpx;
-  border-radius: 12rpx;
-  border: 1rpx solid #c3c3c3;
-}
+	.unactive {
+		width: 218rpx;
+		height: 148rpx;
+		border-radius: 12rpx;
+		border: 1rpx solid #c3c3c3;
+	}
 
-.poptitle {
-  width: 142rpx;
-  height: 50rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 600;
-  font-size: 36rpx;
-  color: #333333;
-  text-align: center;
-  width: 100%;
-}
+	.poptitle {
+		width: 142rpx;
+		height: 50rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 600;
+		font-size: 36rpx;
+		color: #333333;
+		text-align: center;
+		width: 100%;
+	}
 
-.back {
-  background: rgba(244, 244, 244, 1);
-  padding: 20rpx 24rpx;
-  box-sizing: border-box;
+	.back {
+		background: rgba(244, 244, 244, 1);
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
 
-  .btn {
-    width: 750rpx;
-    height: 166rpx;
-    background: #ffffff;
-    box-shadow: 0rpx -1rpx 0rpx 0rpx rgba(0, 0, 0, 0.05);
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    padding: 0 24rpx 5rpx 5rpx;
-    box-sizing: border-box;
+		.btn {
+			width: 750rpx;
+			height: 166rpx;
+			background: #ffffff;
+			box-shadow: 0rpx -1rpx 0rpx 0rpx rgba(0, 0, 0, 0.05);
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			padding: 0 24rpx 5rpx 5rpx;
+			box-sizing: border-box;
 
-    .money {
-      font-family: HarmonyOS_Sans_Medium;
-      font-size: 48rpx;
-      color: #f83224;
-      line-height: 38rpx;
-      text-align: left;
-      font-style: normal;
-      // font-weight: 500;
-      font-weight: bold;
-    }
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 48rpx;
+				color: #f83224;
+				line-height: 38rpx;
+				text-align: left;
+				font-style: normal;
+				// font-weight: 500;
+				font-weight: bold;
+			}
 
-    .kg {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 24rpx;
-      color: #333333;
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.kg {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .order {
-      width: 232rpx;
-      height: 80rpx;
-      background: #f83224;
-      border-radius: 40rpx;
-      font-family: PingFangTC, PingFangTC;
-      font-weight: 500;
-      font-size: 32rpx;
-      color: #ffffff;
-      line-height: 80rpx;
-      text-align: center;
-      font-style: normal;
-      margin-left: 20rpx;
-    }
-  }
+			.order {
+				width: 232rpx;
+				height: 80rpx;
+				background: #f83224;
+				border-radius: 40rpx;
+				font-family: PingFangTC, PingFangTC;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #ffffff;
+				line-height: 80rpx;
+				text-align: center;
+				font-style: normal;
+				margin-left: 20rpx;
+			}
+		}
 
-  //商品相关
-  .abount {
-    padding: 28rpx 24rpx;
-    box-sizing: border-box;
-    background: #ffffff;
-    border-radius: 16rpx;
-    width: 702rpx;
+		//商品相关
+		.abount {
+			padding: 28rpx 24rpx;
+			box-sizing: border-box;
+			background: #ffffff;
+			border-radius: 16rpx;
+			width: 702rpx;
 
-    .zong {
-      width: 654rpx;
-      padding: 22rpx 0 0 0;
-      border-top: 2rpx solid rgba(151, 151, 151, 0.1);
-      margin-top: 32rpx;
+			.zong {
+				width: 654rpx;
+				padding: 22rpx 0 0 0;
+				border-top: 2rpx solid rgba(151, 151, 151, 0.1);
+				margin-top: 32rpx;
 
-      .small {
-        font-family: PingFangTC, PingFangTC;
-        font-weight: 400;
-        font-size: 24rpx;
-        color: #444444;
-        line-height: 34rpx;
-        text-align: left;
-        font-style: normal;
-      }
+				.small {
+					font-family: PingFangTC, PingFangTC;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #444444;
+					line-height: 34rpx;
+					text-align: left;
+					font-style: normal;
+				}
 
-      .mon {
-        font-family: HarmonyOS_Sans_Medium;
-        font-size: 28rpx;
-        color: #f83224;
-        line-height: 38rpx;
-        text-align: left;
-        font-style: normal;
-        margin-left: 12rpx;
-        font-weight: bold;
-      }
-    }
+				.mon {
+					font-family: HarmonyOS_Sans_Medium;
+					font-size: 28rpx;
+					color: #f83224;
+					line-height: 38rpx;
+					text-align: left;
+					font-style: normal;
+					margin-left: 12rpx;
+					font-weight: bold;
+				}
+			}
 
-    .back {
-      background: rgba(244, 244, 244, 1);
-      padding: 22rpx 16rpx;
-      box-sizing: border-box;
-      margin-top: 10rpx;
-      // margin-bottom: 20rpx;
-    }
+			.back {
+				background: rgba(244, 244, 244, 1);
+				padding: 22rpx 16rpx;
+				box-sizing: border-box;
+				margin-top: 10rpx;
+				// margin-bottom: 20rpx;
+			}
 
-    .name {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.name {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .money {
-      font-family: HarmonyOS_Sans_Medium;
-      font-size: 28rpx;
-      color: #222222;
-      line-height: 38rpx;
-      text-align: left;
-      font-style: normal;
-      font-weight: 600;
-    }
-  }
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 28rpx;
+				color: #222222;
+				line-height: 38rpx;
+				text-align: left;
+				font-style: normal;
+				font-weight: 600;
+			}
+		}
 
-  .recommend {
-    margin-top: 20rpx;
+		.recommend {
+			margin-top: 20rpx;
 
-    .title {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 22rpx;
-      color: #222222;
-      line-height: 32rpx;
-      text-align: left;
-      font-style: normal;
-      width: 148rpx;
-      height: 64rpx;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      -webkit-line-clamp: 2;
-      display: -webkit-box;
-      -webkit-box-orient: vertical;
-      word-break: break-all;
-    }
+			.title {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 22rpx;
+				color: #222222;
+				line-height: 32rpx;
+				text-align: left;
+				font-style: normal;
+				width: 148rpx;
+				height: 64rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				-webkit-line-clamp: 2;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				word-break: break-all;
+			}
 
-    .top {
-      width: 702rpx;
-      height: 64rpx;
-      background: linear-gradient(
-        180deg,
-        #ffe7e3 0%,
-        rgba(255, 255, 255, 1) 100%
-      );
-      border-radius: 16rpx 16rpx 0 0;
-      padding: 24rpx 22rpx;
-      box-sizing: border-box;
-    }
+			.top {
+				width: 702rpx;
+				height: 64rpx;
+				background: linear-gradient(180deg,
+						#ffe7e3 0%,
+						rgba(255, 255, 255, 1) 100%);
+				border-radius: 16rpx 16rpx 0 0;
+				padding: 24rpx 22rpx;
+				box-sizing: border-box;
+			}
 
-    .bottom {
-      padding: 0 20rpx 22rpx;
-      box-sizing: border-box;
-      background: #fff;
-    }
-  }
+			.bottom {
+				padding: 0 20rpx 22rpx;
+				box-sizing: border-box;
+				background: #fff;
+			}
+		}
 
-  //物流
-  .logistics {
-    width: 702rpx;
-    // height: 96rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-    padding: 28rpx 22rpx;
-    box-sizing: border-box;
-    margin-top: 20rpx;
+		//物流
+		.logistics {
+			width: 702rpx;
+			// height: 96rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			padding: 28rpx 22rpx;
+			box-sizing: border-box;
+			margin-top: 20rpx;
 
-    .change {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #f83224;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-      margin-right: 8rpx;
-    }
-  }
+			.change {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #f83224;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+				margin-right: 8rpx;
+			}
+		}
 
-  //商城
-  .shop {
-    width: 702rpx;
-    // height: 322rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-    padding: 30rpx 24rpx;
-    margin-top: 20rpx;
-    box-sizing: border-box;
+		//商城
+		.shop {
+			width: 702rpx;
+			// height: 322rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			padding: 30rpx 24rpx;
+			margin-top: 20rpx;
+			box-sizing: border-box;
 
-    .bu {
-      width: 120rpx;
-      height: 40rpx;
-      border-radius: 20rpx;
-      border: 1rpx solid rgba(151, 151, 151, 0.3);
-    }
+			.bu {
+				width: 120rpx;
+				height: 40rpx;
+				border-radius: 20rpx;
+				border: 1rpx solid rgba(151, 151, 151, 0.3);
+			}
 
-    .money {
-      font-family: HarmonyOS_Sans_Medium;
-      font-size: 24rpx;
-      color: #f83224;
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-      font-weight: 600;
-    }
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 24rpx;
+				color: #f83224;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+				font-weight: 600;
+			}
 
-    .name {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 30rpx;
-      color: #222222;
-      line-height: 42rpx;
-      text-align: left;
-      font-style: normal;
-      margin-left: 10rpx;
-    }
+			.name {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #222222;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 10rpx;
+			}
 
-    .weight {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 24rpx;
-      color: rgba(34, 34, 34, 0.6);
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-      margin-top: 16rpx;
-    }
-  }
+			.weight {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: rgba(34, 34, 34, 0.6);
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+				margin-top: 16rpx;
+			}
+		}
 
-  // 地址
-  .address {
-    width: 702rpx;
-    // height: 182rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-    padding: 32rpx 24rpx;
-    box-sizing: border-box;
+		// 地址
+		.address {
+			width: 702rpx;
+			// height: 182rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			padding: 32rpx 24rpx;
+			box-sizing: border-box;
 
-    .add {
-      font-family: SFPro, SFPro;
-      font-weight: 500;
-      font-size: 32rpx;
-      color: #222222;
-      line-height: 36rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.add {
+				font-family: SFPro, SFPro;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #222222;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .info {
-      font-family: SFPro, SFPro;
-      font-weight: 400;
-      font-size: 24rpx;
-      color: #555555;
-      line-height: 28rpx;
-      text-align: left;
-      font-style: normal;
-      margin-top: 20rpx;
-    }
-  }
-}
+			.info {
+				font-family: SFPro, SFPro;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #555555;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+				margin-top: 20rpx;
+			}
+		}
+	}
 
-.minus {
-  width: 22px;
-  height: 22px;
-  border-width: 1px;
-  border-color: #e6e6e6;
-  border-style: solid;
-  border-top-left-radius: 100px;
-  border-top-right-radius: 100px;
-  border-bottom-left-radius: 100px;
-  border-bottom-right-radius: 100px;
-  @include flex;
-  justify-content: center;
-  align-items: center;
-}
+	.minus {
+		width: 22px;
+		height: 22px;
+		border-width: 1px;
+		border-color: #e6e6e6;
+		border-style: solid;
+		border-top-left-radius: 100px;
+		border-top-right-radius: 100px;
+		border-bottom-left-radius: 100px;
+		border-bottom-right-radius: 100px;
+		@include flex;
+		justify-content: center;
+		align-items: center;
+	}
 
-.input {
-  padding: 0 10px;
-}
+	.input {
+		padding: 0 10px;
+	}
 
-.plus {
-  width: 22px;
-  height: 22px;
-  background-color: #ff0000;
-  border-radius: 50%;
-  /* #ifndef APP-NVUE */
-  display: flex;
-  /* #endif */
-  justify-content: center;
-  align-items: center;
-}
-</style>
+	.plus {
+		width: 22px;
+		height: 22px;
+		background-color: #ff0000;
+		border-radius: 50%;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+</style>

pageA/productdetails.vue

@@ -1,1818 +1,1627 @@
 <template>
-  <view class="page">
-    <!-- 页面内容 -->
-    <!-- 自定义导航栏 -->
-    <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="returnindex"></u-icon>
-          <u-tabs
-            :duration="duration"
-            @click="scrollToPosition"
-            :list="list1"
-            lineColor="#fff"
-            :activeStyle="{ color: '#FF1515' }"
-            :inactiveStyle="{
+	<view class="page">
+		<!-- 页面内容 -->
+		<!-- 自定义导航栏 -->
+		<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="returnindex"></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">
+            }"></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="" @click="sharea">
-          <image
-            src="static/images/share.png"
-            style="width: 38rpx; height: 38rpx"
-            mode=""
-          ></image>
-        </view>
-        <view class="" style="width: 200rpx"></view>
-      </view>
-    </u-navbar>
-    <!-- 商品图片 -->
-    <scroll-view
-      ref="scrollView"
-      scroll-y="true"
-      style="min-height: 100vh"
-      :scroll-into-view="toView"
-      scroll-with-animation="true"
-    >
-      <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>
-          <template v-if="goodinfo.images">
-            <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>
-          </template>
-        </swiper>
-      </view>
-      <view class="back">
-        <!-- 折扣 -->
-        <view class="discount">
-          <view class="top">
-            <text class="count" v-if="goodinfo.is_discount == 0">{{
+			</view>
+			<view class="u-nav-slot u-flex" slot="right" style="display: flex">
+				<view class="" style="" @click="sharea">
+					<image src="static/images/share.png" style="width: 38rpx; height: 38rpx" mode=""></image>
+				</view>
+				<view class="" style="width: 200rpx"></view>
+			</view>
+		</u-navbar>
+		<!-- 商品图片 -->
+		<scroll-view ref="scrollView" scroll-y="true" style="min-height: 100vh" :scroll-into-view="toView"
+			scroll-with-animation="true">
+			<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>
+					<template v-if="goodinfo.images">
+						<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>
+					</template>
+				</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">{{
+						<text class="money">¥</text>
+						<text class="money" style="font-size: 48rpx">{{
               goodinfo.discount_price.slice(0, -3)
             }}</text>
-            <text class="money">{{ goodinfo.discount_price.slice(-3) }}</text>
-            <!-- <text class="right" v-if="goodinfo.is_discount == 0">¥{{ goodinfo.price }}</text> -->
-            <text class="right" v-if="goodinfo.is_discount == 0"
-              >¥{{ goodinfo.price * value }}</text
-            >
-          </view>
-          <view class="bottom">
-            <view class="u-flex" style="column-gap: 16rpx">
-              <div v-for="(tab, idx) in goodinfo.label_arr" :key="idx">
-                <text v-if="language == 'zh-CN'" class="tabs">{{
+						<text class="money">{{ goodinfo.discount_price.slice(-3) }}</text>
+						<!-- <text class="right" v-if="goodinfo.is_discount == 0">¥{{ goodinfo.price }}</text> -->
+						<text class="right" v-if="goodinfo.is_discount == 0">¥{{ goodinfo.price * value }}</text>
+					</view>
+					<view class="bottom">
+						<view class="u-flex" style="column-gap: 16rpx">
+							<div v-for="(tab, idx) in goodinfo.label_arr" :key="idx">
+								<text v-if="language == 'zh-CN'" class="tabs">{{
                   tab.name_cn
                 }}</text>
-                <text v-if="language == 'en-US'" class="tabs">{{
+								<text v-if="language == 'en-US'" class="tabs">{{
                   tab.name_en
                 }}</text>
-                <text v-if="language == 'es-ES'" class="tabs">{{
+								<text v-if="language == 'es-ES'" class="tabs">{{
                   tab.name_es
                 }}</text>
-                <text v-if="language == 'it-IT'" class="tabs">{{
+								<text v-if="language == 'it-IT'" class="tabs">{{
                   tab.name_ita
                 }}</text>
-              </div>
-            </view>
-            <view class="">
-              <text class="title" 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="openfu"
-          >
-            <view class="u-flex">
-              <view class="change">{{ i18n.service }}</view>
-              <view
-                v-if="language == 'zh-CN'"
-                class=""
-                style="margin-left: 20rpx"
-                >{{ content.name_cn }}
-              </view>
-              <view
-                v-if="language == 'en-US'"
-                class=""
-                style="margin-left: 20rpx"
-                >{{ content.name_en }}
-              </view>
-              <view
-                v-if="language == 'es-ES'"
-                class=""
-                style="margin-left: 20rpx"
-                >{{ content.name_es }}
-              </view>
-              <view
-                v-if="language == 'it-IT'"
-                class=""
-                style="margin-left: 20rpx"
-                >{{ content.name_ita }}
-              </view>
-            </view>
-            <view class="">
-              <u-icon name="arrow-right" size="16"></u-icon>
-            </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="item.member.avatar"
-                  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">{{
+							</div>
+						</view>
+						<view class="">
+							<text class="title" 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="openfu">
+						<view class="u-flex">
+							<view class="change">{{ i18n.service }}</view>
+							<view v-if="language == 'zh-CN'" class="" style="margin-left: 20rpx">{{ content.name_cn }}
+							</view>
+							<view v-if="language == 'en-US'" class="" style="margin-left: 20rpx">{{ content.name_en }}
+							</view>
+							<view v-if="language == 'es-ES'" class="" style="margin-left: 20rpx">{{ content.name_es }}
+							</view>
+							<view v-if="language == 'it-IT'" class="" style="margin-left: 20rpx">{{ content.name_ita }}
+							</view>
+						</view>
+						<view class="">
+							<u-icon name="arrow-right" size="16"></u-icon>
+						</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="item.member.avatar" 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" style="width: 600">{{
+					</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" style="width: 600">{{
                 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"
-                  v-model="rate"
-                  max="5"
-                />
-                <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 }} {{ goodinfo.merchant.sale_num }}</text
-                >
-                <view class="line"></view>
-                <!-- 评价总数 -->
-                <text class="num"
-                  >{{ i18n.review }} {{ goodinfo.merchant.comment_num }}</text
-                >
-              </view>
-            </view>
-          </view>
-          <view class="goshop" @click="goshop(goodinfo.merchant.id)">{{
+							<view class="redback u-flex">
+								<uni-rate network allow-half :readonly="true" active-color="red"
+									color="rgba(255, 27, 0, 0.5)" :size="8" v-model="rate" max="5" />
+								<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 }} {{ goodinfo.merchant.sale_num }}</text>
+								<view class="line"></view>
+								<!-- 评价总数 -->
+								<text class="num">{{ i18n.review }} {{ goodinfo.merchant.comment_num }}</text>
+							</view>
+						</view>
+					</view>
+					<view class="goshop" @click="goshop(goodinfo.merchant.id)">{{
             i18n.stroll
           }}</view>
-        </view>
-        <!-- 推荐 -->
-        <view class="recommend">
-          <view class="title">
-            {{ i18n.Recommended }}
-          </view>
-          <view class="" style="margin-top: 10rpx">
-            <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="
+				</view>
+				<!-- 推荐 -->
+				<view class="recommend">
+					<view class="title">
+						{{ i18n.Recommended }}
+					</view>
+					<view class="" style="margin-top: 10rpx">
+						<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;
                         border-radius: 10rpx;
-                      "
-                      mode=""
-                    >
-                    </image>
-                    <view
-                      class="over"
-                      style="
+                      " mode="">
+										</image>
+										<view class="over" style="
                         width: 214rpx;
                         margin-top: 14rpx;
                         font-style: normal;
                         font-size: 26rpx;
-                      "
-                      v-if="language == 'zh-CN'"
-                    >
-                      {{ child.name_cn }}
-                    </view>
-                    <view
-                      class="over"
-                      style="
+                      " v-if="language == 'zh-CN'">
+											{{ child.name_cn }}
+										</view>
+										<view class="over" style="
                         width: 214rpx;
                         margin-top: 14rpx;
                         font-style: normal;
                         font-size: 26rpx;
-                      "
-                      v-if="language == 'en-US'"
-                    >
-                      {{ child.name_en }}
-                    </view>
-                    <view
-                      class="over"
-                      style="
+                      " v-if="language == 'en-US'">
+											{{ child.name_en }}
+										</view>
+										<view class="over" style="
                         width: 214rpx;
                         margin-top: 14rpx;
                         font-style: normal;
                         font-size: 26rpx;
-                      "
-                      v-if="language == 'es-ES'"
-                    >
-                      {{ child.name_es }}
-                    </view>
-                    <view
-                      class="over"
-                      style="
+                      " v-if="language == 'es-ES'">
+											{{ child.name_es }}
+										</view>
+										<view class="over" 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; font-size: 26rpx"
-            >{{ 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="" style="margin-top: 28rpx">
-            <view v-if="language == 'zh-CN'" class="">
-              <u-parse :content="goodinfo.detail_cn"></u-parse>
-            </view>
-            <view v-if="language == 'en-US'" class="">
-              <u-parse :content="goodinfo.detail_en"></u-parse>
-            </view>
-            <view v-if="language == 'es-ES'" class="">
-              <u-parse :content="goodinfo.detail_es"></u-parse>
-            </view>
-            <view v-if="language == 'it-IT'" class="">
-              <u-parse :content="goodinfo.detail_ita"></u-parse>
-            </view>
-            <!-- <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"
-              @click="chat"
-            >
-              <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="
+                      " 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; font-size: 26rpx">
+						{{ 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="" style="margin-top: 28rpx">
+						<view v-if="language == 'zh-CN'" class="">
+							<u-parse :content="goodinfo.detail_cn"></u-parse>
+						</view>
+						<view v-if="language == 'en-US'" class="">
+							<u-parse :content="goodinfo.detail_en"></u-parse>
+						</view>
+						<view v-if="language == 'es-ES'" class="">
+							<u-parse :content="goodinfo.detail_es"></u-parse>
+						</view>
+						<view v-if="language == 'it-IT'" class="">
+							<u-parse :content="goodinfo.detail_ita"></u-parse>
+						</view>
+						<!-- <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" @click="chat">
+							<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">{{
+              " @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)"
-              >
-                {{ i18n.Followed }}
-              </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)"
-            >{{ i18n.Addtocart }}</view
-          >
-          <view v-if="sku_info.stock_total != 0" class="pin" @click="join(1)">{{
+							<view v-if="goodinfo.is_interest == 0" class="ke" style="color: rgba(248, 50, 36, 1)">
+								{{ i18n.Followed }}
+							</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)">{{ i18n.Addtocart }}</view>
+					<view v-if="sku_info.stock_total != 0" class="pin" @click="join(1)">{{
             i18n.grouping
           }}</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="
+				</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="
               JSON.stringify(sku_info) == '{}' ? goodinfo.image : sku_info.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; font-weight: 600">{{
+            " 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; font-weight: 600">{{
                 (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;font-weight: 600;"
+							<!-- <text class="read" v-if="goodinfo.is_discount==0">{{(goodinfo.discount_price * value).slice(-3)}}</text> -->
+							<!-- 							<text class="read" style="font-size: 40rpx;font-weight: 600;"
 								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"
-              >{{ i18n.Selected }}：{{
+							<!-- <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">{{ i18n.Selected }}：{{
                 selectArr.join(",") || i18n.selection
-              }}</text
-            >
-          </view>
-        </view>
-        <view
-          class=""
-          style="position: absolute; top: 48rpx; right: 28rpx"
-          @click="close"
-        >
-          <u-icon name="close" 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="flex-wrap: wrap">
-            <view
-              style="margin-right: 18rpx; margin-bottom: 18rpx"
-              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">{{ i18n.number }}</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">
-            {{ i18n.Addtocart }}
-          </view>
-          <view v-if="shopcar == 1" class="btn" @click="order">
-            {{ i18n.Buynow }}
-          </view>
-          <view v-if="shopcar == 2" class="btn" @click="close">
-            {{ i18n.enter }}
-          </view>
-        </view>
-      </view>
-    </u-popup>
-    <u-popup :show="serve" :round="20">
-      <view
-        style="
+              }}</text>
+					</view>
+				</view>
+				<view class="" style="position: absolute; top: 48rpx; right: 28rpx" @click="close">
+					<u-icon name="close" color="#000" size="28"></u-icon>
+				</view>
+				<view class="" v-for="(item, index) in goodinfo.sku">
+					<view v-if="language == 'zh-CN'" class="title1" style="margin-top: 40rpx; margin-bottom: 32rpx">
+						{{ item.name }}
+					</view>
+					<view v-if="language == 'en-US'" class="title1" style="margin-top: 40rpx; margin-bottom: 32rpx">
+						{{ item.name_en }}
+					</view>
+					<view v-if="language == 'es-ES'" class="title1" style="margin-top: 40rpx; margin-bottom: 32rpx">
+						{{ item.name_es }}
+					</view>
+					<view v-if="language == 'it-IT'" class="title1" style="margin-top: 40rpx; margin-bottom: 32rpx">
+						{{ item.name_ita }}
+					</view>
+
+					<view class="u-flex" style="flex-wrap: wrap">
+						<view style="margin-right: 18rpx; margin-bottom: 18rpx" class=""
+							:class="selectArr[index] == child.name || selectArr[index] == child.name_en || selectArr[index] == child.name_es ||selectArr[index] == child.name_ita? 'acttab' : 'tabs'"
+							v-for="(child, idx) in item.values" :key="idx" @click="actabs(index, child, item)">
+							<text v-if="language == 'zh-CN'">{{child.name}}</text>
+							<text v-if="language == 'en-US'">{{child.name_en}}</text>
+							<text v-if="language == 'es-ES'">{{child.name_es}}</text>
+							<text v-if="language == 'it-IT'">{{child.name_ita}}</text>
+						</view>
+					</view>
+				</view>
+				<view class="u-flex u-row-between" style="margin-top: 30rpx">
+					<text class="title1">{{ i18n.number }}</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">
+						{{ i18n.Addtocart }}
+					</view>
+					<view v-if="shopcar == 1" class="btn" @click="order">
+						{{ i18n.Buynow }}
+					</view>
+					<view v-if="shopcar == 2" class="btn" @click="close">
+						{{ i18n.enter }}
+					</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"> {{ i18n.sales }} </text>
-        </view>
-        <view
-          class=""
-          style="position: absolute; top: 48rpx; right: 24rpx"
-          @click="close()"
-        >
-          <u-icon name="close" style="width: 22rpx; height: 22rpx"></u-icon>
-        </view>
-        <view class="contenta">
-          <view class="" v-if="language == 'zh-CN'">
-            <u-parse :content="content.content_cn"></u-parse>
-          </view>
-          <view class="" v-if="language == 'en-US'">
-            <u-parse :content="content.content_en"></u-parse>
-          </view>
-          <view class="" v-if="language == 'es-ES'">
-            <u-parse :content="content.content_es"></u-parse>
-          </view>
-          <view class="" v-if="language == 'it-IT'">
-            <u-parse :content="content.content_ita"></u-parse>
-          </view>
-        </view>
-        <view class="button" @click="close()">
-          {{ i18n.know }}
-        </view>
-      </view>
-    </u-popup>
-    <u-popup :round="10" :show="share" bgColor=" rgba(244, 244, 244, 1);">
-      <view
-        style="
+        ">
+				<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"> {{ i18n.sales }} </text>
+				</view>
+				<view class="" style="position: absolute; top: 48rpx; right: 24rpx" @click="close()">
+					<u-icon name="close" style="width: 22rpx; height: 22rpx"></u-icon>
+				</view>
+				<view class="contenta">
+					<view class="" v-if="language == 'zh-CN'">
+						<u-parse :content="content.content_cn"></u-parse>
+					</view>
+					<view class="" v-if="language == 'en-US'">
+						<u-parse :content="content.content_en"></u-parse>
+					</view>
+					<view class="" v-if="language == 'es-ES'">
+						<u-parse :content="content.content_es"></u-parse>
+					</view>
+					<view class="" v-if="language == 'it-IT'">
+						<u-parse :content="content.content_ita"></u-parse>
+					</view>
+				</view>
+				<view class="button" @click="close()">
+					{{ 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
-            @click="toxieyi"
-            src="../static/images/index/bottom2.png"
-            style="width: 40rpx; height: 40rpx"
-          >
-          </image>
-        </view>
-        <!-- 				<view class="" style="position: absolute;top: 48rpx;right:24rpx;">
+        ">
+				<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 @click="toxieyi" 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"
-          style="margin-top: 82rpx; padding: 0 140rpx; justify-content: center"
-        >
-          <!-- 					<view class="" @click="copylink">
+				<view class="u-flex" style="margin-top: 82rpx; padding: 0 140rpx; justify-content: center">
+					<!-- 					<view class="" @click="copylink">
 						<image src="../static/images/index/link.png" style="width: 108rpx; height: 108rpx" mode="">
 						</image>
 						<view class="link">{{ i18n.Copylink }}</view>
 					</view> -->
-          <view
-            class="u-row-center"
-            style="display: flex; flex-direction: column; align-items: center"
-            @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="close"
-          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="close()" color="#fff" size="28"></u-icon>
-      </view>
-      <image :src="picture2" mode="widthFix"></image>
-      <view class="button" style="width: 658rpx" @click="saveImage">{{
+					<view class="u-row-center" style="display: flex; flex-direction: column; align-items: center"
+						@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="close" 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="close()" color="#fff" size="28"></u-icon>
+			</view>
+			<image :src="picture2" mode="widthFix"></image>
+			<view class="button" style="width: 658rpx" @click="saveImage">{{
         i18n.album
       }}</view>
-    </u-popup>
-    <l-painter
-      custom-style="position: fixed; left: 200%"
-      ref="poster"
-      css="width: 538rpx; height:900rpx; background: #fff;padding:24rpx"
-    >
-      <l-painter-image
-        :src="goodinfo.image"
-        css="width: 490rpx; height: 490rpx"
-      />
-      <l-painter-text text="¥" css=" padding-top: 20rpx;color:#F83224;" />
-      <l-painter-text
-        :text="goodinfoyuan"
-        css="text-align:center; padding-top: 20rpx;color:#F83224; font-size: 26rpx"
-      />
-
-      <l-painter-text
-        :text="goodinfoname"
-        css=" padding-top: 20rpx;display:block"
-      />
-      <l-painter-qrcode
-        :text="'https://cbec.hdlkeji.com/cbec?id=' + id + '&userid=' + userid"
-        css="width: 132rpx; height: 132rpx;margin-top:44rpx;margin-left:174rpx"
-      />
-      <l-painter-text
-        :text="i18n.identify"
-        css=" padding-top: 20rpx;text-align:center;display:block;color:#777777"
-      />
-    </l-painter>
-  </view>
+		</u-popup>
+		<l-painter custom-style="position: fixed; left: 200%" ref="poster"
+			css="width: 538rpx; height:900rpx; background: #fff;padding:24rpx">
+			<l-painter-image :src="goodinfo.image" css="width: 490rpx; height: 490rpx" />
+			<l-painter-text text="¥" css=" padding-top: 20rpx;color:#F83224;" />
+			<l-painter-text :text="goodinfoyuan"
+				css="text-align:center; padding-top: 20rpx;color:#F83224; font-size: 26rpx" />
+
+			<l-painter-text :text="goodinfoname" css=" padding-top: 20rpx;display:block" />
+			<l-painter-qrcode :text="'https://cbec.hdlkeji.com/cbec?id=' + id + '&userid=' + userid"
+				css="width: 132rpx; height: 132rpx;margin-top:44rpx;margin-left:174rpx" />
+			<l-painter-text :text="i18n.identify"
+				css=" padding-top: 20rpx;text-align:center;display:block;color:#777777" />
+		</l-painter>
+	</view>
 </template>
 
 <script>
-import WebIM from "@/newSDK/Easemob-chat-4.1.7.js";
-import { conn } from "@/utils/WebIM";
-import list from "../uview-ui/libs/config/props/list";
-export default {
-  data() {
-    return {
-      share_merchant_id: "",
-      toView: "",
-      imagea: false,
-      goodinfoname: "",
-      goodinfoyuan: "",
-      current: 0,
-      // 购物车
-      show: false,
-      //服务
-      serve: false,
-      //分享
-      share: false,
-      value: 1, //步进器的值
-      swiptlist: [], //推荐列表
-      actab: 0,
-      id: "", //商品id
-      language: "zh-CN",
-      goodinfo: {}, //商品详情
-      duration: 0, //tabs选项
-      actidx: 0,
-      subIndex: [],
-      selectArr: [],
-      shopcar: "",
-      sku_info: {},
-      commentlist: [],
-      total: "",
-      rate: 5,
-      content: {},
-      bao: "",
-      picture2: "",
-      userid: "",
-      fu: "",
-      name_c: "",
-    };
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-    list1() {
-      var List = [
-        {
-          name: this.i18n.mineCommodity,
-        },
-        {
-          name: this.i18n.evaluate,
-        },
-        {
-          name: this.i18n.particulars,
-        },
-      ];
-      return List;
-    },
-  },
-  onLoad(options) {
-    console.log(options);
-    if (options.q && options.q != "undefined") {
-      // 获取到二维码原始链接内容
-      const qrUrl = decodeURIComponent(options.q);
-      //此处就是我们要获取的参数 json，通过方法解析
-      let jsonUrl = this.GetwxUrlParam(qrUrl);
-      //比如我要得到id的值，直接取值即可
-      console.log("jsonUrl", jsonUrl);
-      let id = jsonUrl.id;
-      this.share_merchant_id = jsonUrl.userid;
-      this.id = id;
-      this.comment();
-      this.detail(this.id);
-    } else {
-      if (uni.getStorageSync("user_info")) {
-        var user_info = uni.getStorageSync("user_info");
-        this.userid = user_info.id;
-        console.log(this.userid);
-      }
-      this.id = options.id;
-      this.comment();
-      this.detail(this.id);
-    }
-  },
-  onShow() {
-    if (uni.getStorageSync("language") != "") {
-      this.language = uni.getStorageSync("language");
-    }
-    this.recommend();
-    this.guarantee();
-  },
-  mounted() {
-    this.$refs.poster.canvasToTempFilePathSync({
-      fileType: "jpg",
-      quality: 1,
-      success: (res) => {
-        // console.log(`mounted`, res.tempFilePath)
-        this.picture2 = res.tempFilePath;
-      },
-    });
-  },
-  methods: {
-    //返佣规则
-    toxieyi() {
-      uni.navigateTo({
-        url: "/pageB/xieyi?code=" + "rebate_proportion",
-      });
-    },
-    //解析链接地址
-    GetwxUrlParam(url) {
-      let theRequest = {};
-      if (url.indexOf("#") != -1) {
-        const str = url.split("#")[1];
-        const strs = str.split("&");
-        for (let i = 0; i < strs.length; i++) {
-          theRequest[strs[i].split("=")[0]] = decodeURI(strs[i].split("=")[1]);
-        }
-      } else if (url.indexOf("?") != -1) {
-        const str = url.split("?")[1];
-        const strs = str.split("&");
-        for (let i = 0; i < strs.length; i++) {
-          theRequest[strs[i].split("=")[0]] = decodeURI(strs[i].split("=")[1]);
-        }
-      }
-      return theRequest;
-    },
-    //分享
-    onShareAppMessage(res) {
-      if (res.from === "button") {
-        // 来自页面内分享按钮
-        console.log(res.target);
-      }
-      return {
-        title: "自定义分享标题",
-        path: "/pageA/productdetails?id=" + this.id,
-      };
-    },
-    //保存到手机相册
-    saveImage() {
-      var that = this;
-      var fileManager = uni.getFileSystemManager();
-      fileManager.writeFile({
-        filePath: wx.env.USER_DATA_PATH + "/img.jpg", // 指定图片的临时路径
-        data: this.picture2.slice(23), // 要写入的文本或二进制数据
-        encoding: "base64", // 指定写入文件的字符编码
-        success: (res) => {
-          console.log(wx.env.USER_DATA_PATH + "/img.jpg");
-          uni.saveImageToPhotosAlbum({
-            // 保存图片到相册
-            filePath: wx.env.USER_DATA_PATH + "/img.jpg",
-            success: function (res) {
-              uni.showToast({
-                title: this.i18n.savesuccessfully,
-              });
-              that.imagea = false;
-            },
-            fail: function (err) {
-              console.log("保存失败", err);
-              that.imagea = false;
-            },
-          });
-        },
-        file: (err) => {
-          console.log("写入文件失败", err);
-        },
-      });
-    },
-    // 将页面转换成图片的方法
-    copylink() {
-      this.$u.toast(this.i18n.window);
-    },
-    openfu() {
-      this.serve = true;
-    },
-    returnindex() {
-      // uni.switchTab({
-      // 	url: '/pages/index/index'
-      // })
-      uni.navigateBack();
-    },
-    chat() {
-      let useinfo = uni.getStorageSync("user_info");
-      let that = this;
-      let id = conn.getUniqueId(); // 生成本地消息id
-      let msg = new WebIM.message("txt", id); // 创建文本消息
-      msg.set({
-        type: "txt",
-        msg: this.i18n.merchandiseNews,
-        to: this.goodinfo.merchant.member.easemob_username,
-        chatType: "singleChat",
-        ext: {
-          type: "shopinfo",
-          order: {
-            name: that.name_c,
-            image: that.goodinfo.image,
-            discount_price: that.goodinfo.discount_price,
-            fu: that.fu,
-            id: that.id,
-          },
-          user_other: that.goodinfo.merchant,
-          user: useinfo,
-        },
-        success: function (id, serverMsgId) {
-          uni.navigateTo({
-            url:
-              "/pageA/chat/chat?user_other=" +
-              encodeURIComponent(JSON.stringify(that.goodinfo.merchant)) +
-              "&user_other_no=" +
-              that.goodinfo.merchant.member.easemob_username,
-          });
-        },
-        fail: function (e) {
-          console.log("发送消息失败");
-        },
-      });
-      conn.send(msg.body);
-    },
-    sharea() {
-      this.share = true;
-    },
-    close() {
-      this.show = false;
-      this.share = false;
-      this.serve = false;
-      this.imagea = false;
-    },
-    //评论页面
-    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.i18n.shutdown);
-            this.detail(this.id);
-          } else {
-            this.$u.toast(this.i18n.Focus);
-            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);
-      var that = this;
-      this.current = e.index;
-      console.log(this.current);
-      this.$nextTick(() => {
-        that.toView = "scroll" + e.index;
-        console.log("view", that.toView);
-      });
-      if (!e.index) {
-        uni.pageScrollTo({
-          scrollTop: 0,
-          duration: 300,
-        });
-      } else if (e.index == 1 || e.index == 2) {
-        uni
-          .createSelectorQuery()
-          .select(e.index == 1 ? "#scroll1" : "#scroll2")
-          .boundingClientRect((data) => {
-            uni
-              .createSelectorQuery()
-              .select(".page")
-              .boundingClientRect((res) => {
-                uni.pageScrollTo({
-                  duration: 100,
-                  scrollTop: data.top - res.top - 66,
-                });
-              })
-              .exec();
-          })
-          .exec();
-      }
-    },
-    //逛逛
-    goshop(id) {
-      uni.navigateTo({
-        url:
-          "/pageD/homepage/homepage?user_other=" +
-          encodeURIComponent(JSON.stringify(this.goodinfo.merchant)) +
-          "&user_other_no=" +
-          this.goodinfo.merchant.member.easemob_username +
-          "&merchant_id=" +
-          id +
-          "&show=" +
-          true,
-      });
-    },
-    detail(id) {
-      uni.$u.http
-        .get("/api/goods/detail/" + id)
-        .then((res) => {
-          console.log(res);
-          this.goodinfo = res;
-          if (this.language == "en-US") {
-            this.name_c = this.goodinfo.name_en;
-          }
-          if (this.language == "es-ES") {
-            this.name_c = this.goodinfo.name_es;
-          }
-          if (this.language == "it-IT") {
-            this.name_c = this.goodinfo.name_ita;
-          }
-
-          if (this.language == "zh-CN") {
-            this.name_c = this.goodinfo.name_cn;
-          }
-          this.goodinfoname = this.goodinfo.name_cn;
-          this.goodinfoyuan = this.goodinfo.discount_price;
-          this.comment();
-          this.rate = res.merchant.score;
-        })
-        .catch(() => {});
-    },
-    //保障服务
-    guarantee() {
-      uni.$u.http
-        .get("/api/agreement?code=guarantee_service")
-        .then((res) => {
-          console.log(res);
-          this.content = res;
-          if (this.language == "en-US") {
-            this.fu = this.content.name_en;
-          }
-          if (this.language == "es-ES") {
-            this.fu = this.content.name_es;
-          }
-          if (this.language == "it-IT") {
-            this.fu = this.content.name_ita;
-          }
-
-          if (this.language == "zh-CN") {
-            this.fu = this.content.name_cn;
-          }
-        })
-        .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;
-          this.goodinfo.discount_price = (
-            (Number(this.sku_info.discount_price * 100) *
-              Number(this.value * 100)) /
-            10000
-          ).toFixed(2);
-          this.goodinfo.price = this.sku_info.price;
-        }
-      });
-      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)) +
-            "&share_merchant_id=" +
-            this.share_merchant_id,
-        });
-      } else {
-        this.$u.toast(this.i18n.understock);
-        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(this.i18n.understock);
-      } 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_member_id: this.share_merchant_id, //是 String 分享团长id
-          })
-          .then((res) => {
-            this.$u.toast(this.i18n.successfullyAdded);
-          })
-          .catch(() => {});
-      }
-    },
-    valChange(e) {
-      this.goodinfo.discount_price = (
-        (Number(this.sku_info.discount_price * 100) * Number(e.value * 100)) /
-        10000
-      ).toFixed(2);
-      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,
-          });
-        },
-      });
-    },
-  },
-};
+	import WebIM from "@/newSDK/Easemob-chat-4.1.7.js";
+	import {
+		conn
+	} from "@/utils/WebIM";
+	import list from "../uview-ui/libs/config/props/list";
+	export default {
+		data() {
+			return {
+				share_merchant_id: "",
+				toView: "",
+				imagea: false,
+				goodinfoname: "",
+				goodinfoyuan: "",
+				current: 0,
+				// 购物车
+				show: false,
+				//服务
+				serve: false,
+				//分享
+				share: false,
+				value: 1, //步进器的值
+				swiptlist: [], //推荐列表
+				actab: 0,
+				id: "", //商品id
+				language: "zh-CN",
+				goodinfo: {}, //商品详情
+				duration: 0, //tabs选项  
+				actidx: 0,
+				subIndex: [],
+				selectArr: [],
+				shopcar: "",
+				sku_info: {},
+				commentlist: [],
+				total: "",
+				rate: 5,
+				content: {},
+				bao: "",
+				picture2: "",
+				userid: "",
+				fu: "",
+				name_c: "",
+				childA: ''
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+			list1() {
+				var List = [{
+						name: this.i18n.mineCommodity,
+					},
+					{
+						name: this.i18n.evaluate,
+					},
+					{
+						name: this.i18n.particulars,
+					},
+				];
+				return List;
+			},
+		},
+		onLoad(options) {
+			console.log(options);
+			if (options.q && options.q != "undefined") {
+				// 获取到二维码原始链接内容
+				const qrUrl = decodeURIComponent(options.q);
+				//此处就是我们要获取的参数 json，通过方法解析
+				let jsonUrl = this.GetwxUrlParam(qrUrl);
+				//比如我要得到id的值，直接取值即可
+				console.log("jsonUrl", jsonUrl);
+				let id = jsonUrl.id;
+				this.share_merchant_id = jsonUrl.userid;
+				this.id = id;
+				this.comment();
+				this.detail(this.id);
+			} else {
+				if (uni.getStorageSync("user_info")) {
+					var user_info = uni.getStorageSync("user_info");
+					this.userid = user_info.id;
+					console.log(this.userid);
+				}
+				this.id = options.id;
+				this.comment();
+				this.detail(this.id);
+			}
+		},
+		onShow() {
+			if (uni.getStorageSync("language") != "") {
+				this.language = uni.getStorageSync("language");
+			}
+			this.recommend();
+			this.guarantee();
+		},
+		mounted() {
+			this.$refs.poster.canvasToTempFilePathSync({
+				fileType: "jpg",
+				quality: 1,
+				success: (res) => {
+					// console.log(`mounted`, res.tempFilePath)
+					this.picture2 = res.tempFilePath;
+				},
+			});
+		},
+		methods: {
+			//返佣规则
+			toxieyi() {
+				uni.navigateTo({
+					url: "/pageB/xieyi?code=" + "rebate_proportion",
+				});
+			},
+			//解析链接地址
+			GetwxUrlParam(url) {
+				let theRequest = {};
+				if (url.indexOf("#") != -1) {
+					const str = url.split("#")[1];
+					const strs = str.split("&");
+					for (let i = 0; i < strs.length; i++) {
+						theRequest[strs[i].split("=")[0]] = decodeURI(strs[i].split("=")[1]);
+					}
+				} else if (url.indexOf("?") != -1) {
+					const str = url.split("?")[1];
+					const strs = str.split("&");
+					for (let i = 0; i < strs.length; i++) {
+						theRequest[strs[i].split("=")[0]] = decodeURI(strs[i].split("=")[1]);
+					}
+				}
+				return theRequest;
+			},
+			//分享
+			onShareAppMessage(res) {
+				if (res.from === "button") {
+					// 来自页面内分享按钮
+					console.log(res.target);
+				}
+				return {
+					title: "自定义分享标题",
+					path: "/pageA/productdetails?id=" + this.id,
+				};
+			},
+			//保存到手机相册
+			saveImage() {
+				var that = this;
+				var fileManager = uni.getFileSystemManager();
+				fileManager.writeFile({
+					filePath: wx.env.USER_DATA_PATH + "/img.jpg", // 指定图片的临时路径
+					data: this.picture2.slice(23), // 要写入的文本或二进制数据
+					encoding: "base64", // 指定写入文件的字符编码
+					success: (res) => {
+						console.log(wx.env.USER_DATA_PATH + "/img.jpg");
+						uni.saveImageToPhotosAlbum({
+							// 保存图片到相册
+							filePath: wx.env.USER_DATA_PATH + "/img.jpg",
+							success: function(res) {
+								uni.showToast({
+									title: this.i18n.savesuccessfully,
+								});
+								that.imagea = false;
+							},
+							fail: function(err) {
+								console.log("保存失败", err);
+								that.imagea = false;
+							},
+						});
+					},
+					file: (err) => {
+						console.log("写入文件失败", err);
+					},
+				});
+			},
+			// 将页面转换成图片的方法
+			copylink() {
+				this.$u.toast(this.i18n.window);
+			},
+			openfu() {
+				this.serve = true;
+			},
+			returnindex() {
+				// uni.switchTab({
+				// 	url: '/pages/index/index'
+				// })
+				uni.navigateBack();
+			},
+			chat() {
+				let useinfo = uni.getStorageSync("user_info");
+				let that = this;
+				let id = conn.getUniqueId(); // 生成本地消息id
+				let msg = new WebIM.message("txt", id); // 创建文本消息
+				msg.set({
+					type: "txt",
+					msg: this.i18n.merchandiseNews,
+					to: this.goodinfo.merchant.member.easemob_username,
+					chatType: "singleChat",
+					ext: {
+						type: "shopinfo",
+						order: {
+							name: that.name_c,
+							image: that.goodinfo.image,
+							discount_price: that.goodinfo.discount_price,
+							fu: that.fu,
+							id: that.id,
+						},
+						user_other: that.goodinfo.merchant,
+						user: useinfo,
+					},
+					success: function(id, serverMsgId) {
+						uni.navigateTo({
+							url: "/pageA/chat/chat?user_other=" +
+								encodeURIComponent(JSON.stringify(that.goodinfo.merchant)) +
+								"&user_other_no=" +
+								that.goodinfo.merchant.member.easemob_username,
+						});
+					},
+					fail: function(e) {
+						console.log("发送消息失败");
+					},
+				});
+				conn.send(msg.body);
+			},
+			sharea() {
+				this.share = true;
+			},
+			close() {
+				this.show = false;
+				this.share = false;
+				this.serve = false;
+				this.imagea = false;
+			},
+			//评论页面
+			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.i18n.shutdown);
+							this.detail(this.id);
+						} else {
+							this.$u.toast(this.i18n.Focus);
+							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);
+				var that = this;
+				this.current = e.index;
+				console.log(this.current);
+				this.$nextTick(() => {
+					that.toView = "scroll" + e.index;
+					console.log("view", that.toView);
+				});
+				if (!e.index) {
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: 300,
+					});
+				} else if (e.index == 1 || e.index == 2) {
+					uni
+						.createSelectorQuery()
+						.select(e.index == 1 ? "#scroll1" : "#scroll2")
+						.boundingClientRect((data) => {
+							uni
+								.createSelectorQuery()
+								.select(".page")
+								.boundingClientRect((res) => {
+									uni.pageScrollTo({
+										duration: 100,
+										scrollTop: data.top - res.top - 66,
+									});
+								})
+								.exec();
+						})
+						.exec();
+				}
+			},
+			//逛逛
+			goshop(id) {
+				uni.navigateTo({
+					url: "/pageD/homepage/homepage?user_other=" +
+						encodeURIComponent(JSON.stringify(this.goodinfo.merchant)) +
+						"&user_other_no=" +
+						this.goodinfo.merchant.member.easemob_username +
+						"&merchant_id=" +
+						id +
+						"&show=" +
+						true,
+				});
+			},
+			detail(id) {
+				uni.$u.http
+					.get("/api/goods/detail/" + id)
+					.then((res) => {
+						console.log(res);
+						this.goodinfo = res;
+						if (this.language == "en-US") {
+							this.name_c = this.goodinfo.name_en;
+						}
+						if (this.language == "es-ES") {
+							this.name_c = this.goodinfo.name_es;
+						}
+						if (this.language == "it-IT") {
+							this.name_c = this.goodinfo.name_ita;
+						}
+
+						if (this.language == "zh-CN") {
+							this.name_c = this.goodinfo.name_cn;
+						}
+						this.goodinfoname = this.goodinfo.name_cn;
+						this.goodinfoyuan = this.goodinfo.discount_price;
+						this.comment();
+						this.rate = res.merchant.score;
+					})
+					.catch(() => {});
+			},
+			//保障服务
+			guarantee() {
+				uni.$u.http
+					.get("/api/agreement?code=guarantee_service")
+					.then((res) => {
+						console.log(res);
+						this.content = res;
+						if (this.language == "en-US") {
+							this.fu = this.content.name_en;
+						}
+						if (this.language == "es-ES") {
+							this.fu = this.content.name_es;
+						}
+						if (this.language == "it-IT") {
+							this.fu = this.content.name_ita;
+						}
+
+						if (this.language == "zh-CN") {
+							this.fu = this.content.name_cn;
+						}
+					})
+					.catch(() => {});
+			},
+			// scrollToPosition() {
+			// 	console.log(111);
+			// 	// 使用$refs获取目标位置的DOM元素
+			// 	const targetElement = this.$refs.targetPosition;
+			// 	// 调用scrollToView方法滚动到目标位置
+			// 	this.$refs.scrollView.scrollToView('targetPosition');
+			// },
+			actabs(index, child, idx) {
+				console.log('index', index);
+				console.log('child', child);
+				console.log('idx', idx);
+				if (this.language == "en-US") {
+					this.childA = child.name_en
+				}
+				if (this.language == "es-ES") {
+					this.childA = child.name_es
+				}
+				if (this.language == "it-IT") {
+					this.childA = child.name_ita
+				}
+				if (this.language == "zh-CN") {
+					this.childA = child.name
+				}
+				if (this.selectArr[index] != this.childA) {
+					this.$set(this.selectArr, index, this.childA);
+					this.$set(this.subIndex, index, idx);
+				} else {
+					this.$set(this.selectArr, index, "");
+					this.$set(this.subIndex, index, -1); //去掉选中颜色
+				}
+				console.log('select', this.selectArr);
+				console.log('this.selectArrindex', this.selectArr[index]);
+				console.log('this.childA', this.childA);
+				this.goodinfo.sku_item.forEach((ite) => {
+					console.log('ite',ite);
+					console.log('this.selectArr.join(",")',this.selectArr.join(","));
+					var active = ''
+					if (this.language == "en-US") {
+						active = ite.item_en
+					}
+					if (this.language == "es-ES") {
+						active = ite.item_es
+					}
+					if (this.language == "it-IT") {
+						active = ite.item_ita
+					}
+					if (this.language == "zh-CN") {
+						active = ite.item
+					}
+					if (active == this.selectArr.join(",")) {
+						this.sku_info = ite;
+						this.goodinfo.discount_price = (
+							(Number(this.sku_info.discount_price * 100) *
+								Number(this.value * 100)) /
+							10000
+						).toFixed(2);
+						this.goodinfo.price = this.sku_info.price;
+					}
+				});
+				console.log(this.sku_info);
+			},
+			order() {
+				if (JSON.stringify(this.sku_info) != "{}") {
+					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)) +
+								"&share_merchant_id=" +
+								this.share_merchant_id,
+						});
+					} else {
+						this.$u.toast(this.i18n.understock);
+						this.show = false;
+					}
+				} else {
+					this.$u.toast(this.i18n.selection + this.i18n.specification);
+				} // console.log(JSON.stringify(this.sku_info));
+			},
+			//生成图片弹窗
+			builder() {
+				this.imagea = true;
+				this.share = false;
+			},
+			//加入购物车
+			joincart() {
+				if (JSON.stringify(this.sku_info) != "{}") {
+					if (this.sku_info.stock_total == 0) {
+						this.$u.toast(this.i18n.understock);
+					} 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_member_id: this.share_merchant_id, //是 String 分享团长id
+							})
+							.then((res) => {
+								this.$u.toast(this.i18n.successfullyAdded);
+								this.show = false;
+							})
+							.catch(() => {});
+					}
+				} else {
+					this.$u.toast(this.i18n.selection + this.i18n.specification);
+				}
+			},
+			valChange(e) {
+				this.goodinfo.discount_price = (
+					(Number(this.sku_info.discount_price * 100) * Number(e.value * 100)) /
+					10000
+				).toFixed(2);
+				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>
-.over {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 26rpx;
-  color: #222222;
-  line-height: 36rpx;
-  text-align: left;
-  font-style: normal;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  -webkit-line-clamp: 2;
-  height: 70rpx;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  word-break: break-all;
-}
-
-.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: 150rpx;
-}
-
-.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;
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  word-break: break-all;
-  -webkit-line-clamp: 2;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-}
-
-.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;
-      word-break: break-all;
-    }
-
-    .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>
+	.over {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #222222;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		-webkit-line-clamp: 2;
+		height: 70rpx;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		word-break: break-all;
+	}
+
+	.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: 150rpx;
+	}
+
+	.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;
+		width: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		word-break: break-all;
+		-webkit-line-clamp: 2;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+	}
+
+	.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;
+				word-break: break-all;
+			}
+
+			.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>

pageA/rule/rule.vue

@@ -1,153 +1,346 @@
 <template>
-<view>
-	<view class="wp-80 pd-tb-40 mg-auto">
-		<button type="warn" @click="showDrawer('showRight')">筛选</button>
+	<view>
+		<h2>管理规格</h2>
+		<div style="border: 1px solid #000;margin-bottom: 20px;" v-for="(spec, index) in specs" :key="index">
+			<div
+				style="display: flex;justify-content: space-between;background: #ddd;height: 40px;align-items: center;padding: 0 20px;box-sizing: border-box;">
+				<div>
+					<label :for="`spec-${index}`">规格名称: </label>
+					<input type="text" :id="`spec-${index}`" v-model="spec.name" @input="rulea" />
+					<input type="text" :id="`spec-${index}`" v-model="spec.name" @input="rulea" />
+					<input type="text" :id="`spec-${index}`" v-model="spec.name" @input="rulea" />
+					<input type="text" :id="`spec-${index}`" v-model="spec.name" @input="rulea" />
+				</div>
+				<div>
+					<button @click="removeSpec(index)" style="margin-right: 20px;">删除规格</button>
+					<button @click="addValue(index)">添加值</button>
+				</div>
+			</div>
+			<div style="display: flex;flex-wrap: wrap;padding: 0 20px;box-sizing: border-box;">
+				<div style="margin: 10px 0;" v-for="(value, idx) in spec.values" :key="idx">
+					<label :for="`value-${index}-${idx}`">规格值: </label>
+					<input type="text" :id="`value-${idx}`" v-model="spec.values[idx].name" @input="rulea" />
+					<input type="text" :id="`value-${idx}`" v-model="spec.values[idx].name_en" @input="rulea" />
+					<input type="text" :id="`value-${idx}`" v-model="spec.values[idx].name_es" @input="rulea" />
+					<input type="text" :id="`value-${idx}`" v-model="spec.values[idx].name_ita" @input="rulea" />
+					<button style="margin:0 20px;" @click="removeValue(index,name)">删除值</button>
+				</div>
+			</div>
+		</div>
+		<button @click="addSpec">添加规格</button>
 	</view>
-	<!-- 筛选-uni-drawer -->
-	<view class="dra_position safe_area">
-		<scroll-view class="scroll-view-box dra_position" scroll-y="true">
-			<view class="pd-25">
-				<block v-for="(item,n) in drawer_list" :key="n">
-					<view class="pd-b-20">{{item.title}}</view>
-					<view class="fss flex-wrap scroll-view-div">
-					<block v-for="(aitem,index) in item.options" :key="index">
-						<view class="radius5 fcc" :class="subIndex[n] == index?'active':''"
-						@click="chooseItem(n,aitem.name,index)">
-							<text>{{aitem.name}}</text>
-						</view>
-					</block>
-					</view>
-				</block>
-			</view>
-		</scroll-view>
-		<view class="dra_close fbc bg-fff">
-			<view class="btns wp-47 radius50" @click="reset">重置</view>
-			<view class="btns1 wp-47 radius50" @click="closeDrawer('showRight')">确定</view>
-		</view>
-	</view>
-</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			drawer_list: [
-				{ "title": "客户来源", "name": "source",
-					options:[
-						{ id: 25, "name": "百度贴吧" },
-						{ id: 26, "name": "淘宝" },
-						{ id: 27, "name": "抖音粉丝" },
-						{ id: 28, "name": "官网客服" },
-						{ id: 29, "name": "百度点击" },
-					]
-				},{ "title": "客户级别", "name": "level",
-					options:[
-						{ id: 22, "name": "意向极高" },
-						{ id: 23, "name": "中等意向" },
-						{ id: 24, "name": "一般意向" },
-					]
-				},{ "title": "客服", "name": "kefu",
-					options:[
-						{ id: 1, "name": "男客服" },
-						{ id: 2, "name": "女客服" },
-					]
-				}
-			],
-			selectArr: [],
-			subIndex: [],
-		}
-	},
-	methods: {
-		chooseItem( _pIndex, _name, index) {
-			if (this.selectArr[_pIndex] != _name) {
-				this.$set(this.selectArr, _pIndex, _name);
-				this.$set(this.subIndex, _pIndex, index);
-			} else {
-				this.$set(this.selectArr, _pIndex, '');
-				this.$set(this.subIndex, _pIndex, -1); //去掉选中颜色
+	export default {
+		data() {
+			return {
+				selectArr: [],
+				subIndex: [],
+				specs: [],
+				zu: [],
+				formattedItems: []
 			}
-			console.log(this.selectArr)
 		},
-		// 抽屉状态发生变化触发
-		change(e, type) { this[type] = e },
-		// 打开抽屉
-		showDrawer(e) { this.$refs[e].open() },
-		// 关闭抽屉
-		closeDrawer(e) { this.$refs[e].close() },
-		// 重置
-		reset() {
-			this.selectArr=[]
-			this.subIndex=[]
+		onLoad() {
+
+		},
+		created() {
+			this.rulea()
 		},
+		methods: {
+			addValue(index) {
+				// this.specs[index].values.push('');
+				this.specs[index].values.push('');
+			},
+			addSpec() {
+				this.specs.push({
+					name: '',
+					values: []
+				});
+			},
+			rulea() {
+				var all = []
+				console.log('specs', this.specs);
+				this.specs.forEach((item) => {
+					all.push(item.values)
+				})
+				this.$nextTick(() => {
+					this.zu = this.cartesianProductOf.apply(this, all)  
+					// console.log(('ruleaaaa', this.zu));
+					if (this.zu) {
+						this.formatItems();
+					}
+				})
+			},
+			removeValue(specIndex, valueIndex) {
+				console.log('specIndex', specIndex);
+				console.log('valueIndex', valueIndex);
+				this.specs[specIndex].values.splice(valueIndex, 1);
+				this.rulea()
+			},
+			// 多规格组合
+			cartesianProductOf() { //笛卡尔积
+				return Array.prototype.reduce.call(arguments, (a, b) => {
+					var ret = [];
+					a.forEach((item) => {
+						b.forEach((child) => {
+							// var c = item.concat([child.name])
+							// console.log(c);
+							// ret.push({item:c});
+							ret.push(item.concat([child]))
+						});
+					});
+					console.log('ret', ret);
+					return ret;
+				}, [
+					[]
+				]);
+			},
+			formatItems() {
+				// 遍历原始数组并转换格式
+				var obj = {}
+				this.formattedItems.map(item => {})
+				console.log('this.formattedItems', this.formattedItems);
+				let formlist = (JSON.parse(JSON.stringify(this.formattedItems)))
+				this.formattedItems = []
+				let resultList = []
+				this.zu.forEach((item, index) => {
+					if (this.zu) {
+						let newlist = []
+						newlist.push({
+							height: item.height,
+							stock_total: item.stock_total,
+							weight: item.weight,
+							length: item.length,
+							width: item.width,
+							price: item.price,
+							image: item.image,
+							is_sales: item.is_sales
+						})
+						let itemV0 = []
+						let itemV1 = []
+						let itemV2 = []
+						let itemV3 = []
+						// resultList.push(itemV)
+						item.forEach((itemC, indexC) => {
+							itemV0.push(itemC.name)
+							itemV1.push(itemC.name_en)
+							itemV2.push(itemC.name_es)
+							itemV3.push(itemC.name_ita)
+						})
+						console.log('itemV1', itemV0);
+						console.log('itemV2', itemV1);
+						console.log('itemV3', itemV2);
+						console.log('itemV4', itemV3);
+
+						this.formattedItems.push({
+							item: itemV0.join(","),
+							item_en: itemV1.join(","),
+							item_es: itemV2.join(","),
+							item_ita: itemV3.join(","),
+							// ...newlist[index]
+							height: '0', // 假设高度为20
+							stock_total: '0', // 库存
+							weight: '0', // 重量
+							length: '0', // 长度
+							width: '0', // 宽度
+							price: '0.00', // 价格
+							image: '', // 图片
+							is_sales: true, // 是否售卖
+						});
+					} else {
+						this.formattedItems = []
+					}
+
+
+
+				});
+
+				// this.formattedItems = newlist.concat(this.formattedItems)
+				console.log('formlist', formlist);
+				console.log('formattedItems', this.formattedItems);
+				this.formattedItems.forEach((item, index) => {
+					formlist.forEach((child, indexC) => {
+						if (formlist.length == this.formattedItems.length) {
+							if (index == indexC) {
+								item.stock_total = child.stock_total // 库存
+								item.height = child.height // 假设高度为20
+								item.weight = child.weight // 重量
+								item.weight = child.weight // 长度
+								item.width = child.width // 宽度
+								item.price = child.price // 价格
+								item.image = child.image // 图片
+								item.is_sales = child.is_sales // 是否售卖
+							}
+						} else {
+							if (item.item == child.item) {
+								item.height = child.height // 假设高度为20
+								item.stock_total = child.stock_total // 库存
+								item.weight = child.weight // 重量
+								item.weight = child.weight // 长度
+								item.width = child.width // 宽度
+								item.price = child.price // 价格
+								item.image = child.image // 图片
+								item.is_sales = child.is_sales // 是否售卖
+							}
+						}
+					})
+				})
+			},
+		}
 	}
-}
 </script>
 
 <style lang="scss">
-.wp-80{ width: 80%; }
-.wp-47{ width: 47%; }
-.mg-auto{ margin: 0 auto; }
-.pd-25{ padding: 25rpx; }
-.pd-b-20{ padding: 0 0 20rpx; }
-.pd-tb-40{ padding: 40rpx 0; }
-.bg-fff{ background-color: #FFFFFF; }
-.radius5{ border-radius: 5rpx; }
-.radius50{ border-radius: 50rpx; }
-.flex-wrap{ flex-wrap: wrap; }
-.fss{
-	display: flex;
-	justify-content: flex-start;
-	align-items: flex-start;
-}
-.fbc{
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-}
-.fcc{
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.safe_area{
-	margin-bottom: constant(safe-area-inset-bottom);  
-	margin-bottom: env(safe-area-inset-bottom); 
-}
-.dra_position{
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	width: 100%;
-	height: auto;
-}
-.scroll-view-box{ font-size: 28rpx; bottom: 84rpx; }
-.dra_close{
-	box-sizing: border-box;
-	position: absolute;
-	bottom: 0;
-	width: 100%;
-	padding: 15rpx 30rpx 20rpx;
-	>view{
-		height: 68rpx;
-		line-height: 68rpx;
-		text-align: center;
+	.avatar {
+		width: 60%;
+		float: left;
+	}
+
+	.avatar-uploader .el-upload {
+		border: 1px dashed #d9d9d9;
+		border-radius: 6px;
+		cursor: pointer;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.avatar-uploader .el-upload:hover {
+		border-color: #409EFF;
 	}
-	.btns{ color: #a12a30; border: 1px solid #a12a30; }
-	.btns1{ color: #FFFFFF; background-color: #a12a30; }
-}
-.scroll-view-div{
-	>view:nth-child(3n-1){ margin: 0 10rpx; }
-	>view{
-		width: 32%;
-		height: 72rpx;
-		margin-bottom: 16rpx;
+
+	.avatar-uploader-icon {
+		font-size: 28px;
+		color: #8c939d;
+		width: 178px;
+		height: 178px;
+		line-height: 178px;
 		text-align: center;
-		background-color: #F5F5F5;
 	}
-	.active{
-		color: #ff000b;
-		background-color: #fff4f3;
+
+	.avatara {
+		width: 178px;
+		height: 178px;
+		display: block;
+	}
+
+	.wp-80 {
+		width: 80%;
+	}
+
+	.wp-47 {
+		width: 47%;
+	}
+
+	.mg-auto {
+		margin: 0 auto;
+	}
+
+	.pd-25 {
+		padding: 25rpx;
+	}
+
+	.pd-b-20 {
+		padding: 0 0 20rpx;
+	}
+
+	.pd-tb-40 {
+		padding: 40rpx 0;
+	}
+
+	.bg-fff {
+		background-color: #FFFFFF;
+	}
+
+	.radius5 {
+		border-radius: 5rpx;
+	}
+
+	.radius50 {
+		border-radius: 50rpx;
+	}
+
+	.flex-wrap {
+		flex-wrap: wrap;
+	}
+
+	.fss {
+		display: flex;
+		justify-content: flex-start;
+		align-items: flex-start;
+	}
+
+	.fbc {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.fcc {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.safe_area {
+		margin-bottom: constant(safe-area-inset-bottom);
+		margin-bottom: env(safe-area-inset-bottom);
+	}
+
+	.dra_position {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		width: 100%;
+		height: auto;
+	}
+
+	.scroll-view-box {
+		font-size: 28rpx;
+		bottom: 84rpx;
+	}
+
+	.dra_close {
+		box-sizing: border-box;
+		position: absolute;
+		bottom: 0;
+		width: 100%;
+		padding: 15rpx 30rpx 20rpx;
+
+		>view {
+			height: 68rpx;
+			line-height: 68rpx;
+			text-align: center;
+		}
+
+		.btns {
+			color: #a12a30;
+			border: 1px solid #a12a30;
+		}
+
+		.btns1 {
+			color: #FFFFFF;
+			background-color: #a12a30;
+		}
+	}
+
+	.scroll-view-div {
+		>view:nth-child(3n-1) {
+			margin: 0 10rpx;
+		}
+
+		>view {
+			width: 32%;
+			height: 72rpx;
+			margin-bottom: 16rpx;
+			text-align: center;
+			background-color: #F5F5F5;
+		}
+
+		.active {
+			color: #ff000b;
+			background-color: #fff4f3;
+		}
 	}
-}
-</style>
+</style>

pageB/ParcelExpress.vue

@@ -43,7 +43,7 @@
 			</view>
 			<!-- 地址 -->
 			<view class="address">
-				<view class="left u-flex" style="display: flex;" @click="send">
+				<view class="left u-flex" style="display: flex;">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/ji.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
 						<image @click.stop="changeadd" src="/static/express/change.png"
@@ -71,8 +71,7 @@
 					</view>
 				</view>
 				<view class="left u-flex"
-					style="display: flex;margin-top: 26rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08)"
-					@click="recipirnt">
+					style="display: flex;margin-top: 26rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08)">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/shou.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
 						<!-- <image src="../../static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""> -->
@@ -84,7 +83,7 @@
 							<view class="pople">{{i18n.recipient}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informate}}</view>
 						</view>
-						<view v-else class="u-row-between " style="" @click="send">
+						<view v-else class="u-row-between " style="" @click="recipirnt">
 							<view class="">
 								<text class="topname">{{bottomadd.name}}</text>
 								<text class="topaddress"
@@ -148,7 +147,8 @@
 			  border-radius: 20rpx 20rpx 0 0;
 			">
 					<view class="" style="text-align: center;font-size: 30rpx;font-weight: 600;margin-bottom: 20rpx;">
-						{{contenttitle}}</view>
+						{{contenttitle}}
+					</view>
 					<u-parse :content="content"></u-parse>
 				</view>
 			</u-popup>
@@ -166,19 +166,29 @@
 				topadd: {},
 				bottomadd: {},
 				province_id: '',
-				goodinfo: {}, //物品信息
+				goodinfo: {
+					
+				}, //物品信息
 				sum: '',
 				internationalshow: false,
 				content: '',
 				contenttitle: '',
 				language: "zh-CN",
+				type: '',
+				goodtype:''
 			}
 		},
 		onLoad(options) {
 			this.expressinfo = JSON.parse(decodeURIComponent(options.expressinfo));
+			console.log('expressinfo',this.expressinfo);
 			if (uni.getStorageSync("language") != "") {
 				this.language = uni.getStorageSync("language");
 			}
+			if (options.type == 'pin') {
+				this.type = 'pin'
+				this.goodtype = this.expressinfo.type
+				console.log(this.goodtype);
+			}
 		},
 		computed: {
 			i18n() {
@@ -271,7 +281,7 @@
 				var that = this
 				if (JSON.stringify(this.goodinfo) == '{}') {
 					uni.navigateTo({
-						url: '/pageB/goods',
+						url: '/pageB/goods?type=' + this.type + '&goodtype='+this.goodtype,
 						events: {
 							goodinfo: function(res) {
 								that.goodinfo = res
@@ -281,7 +291,7 @@
 					})
 				} else {
 					uni.navigateTo({
-						url: '/pageB/goods?goodinfo=' + encodeURIComponent(JSON.stringify(this.goodinfo)),
+						url: '/pageB/goods?goodinfo=' + encodeURIComponent(JSON.stringify(this.goodinfo))+'&type=' + this.type + '&goodtype='+this.goodtype,
 						events: {
 							goodinfo: function(res) {
 								that.goodinfo = res
@@ -326,9 +336,28 @@
 				}
 			},
 			recipirnt() {
-				uni.navigateTo({
-					url: '/pageB/recipientinfo'
-				})
+				var that = this
+				if (JSON.stringify(that.bottomadd) == '{}') {
+					uni.navigateTo({
+						url: '/pageB/recipientinfo',
+						events: {
+							bottomadd: function(res) {
+								console.log(res);
+								that.bottomadd = res
+							}
+						}
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pageB/recipientinfo?id=' + that.bottomadd.id,
+						events: {
+							bottomadd: function(res) {
+								console.log(res);
+								that.bottomadd = res
+							}
+						}
+					})
+				}
 			},
 			checkboxChange(n) {
 				console.log('change', n);

pageB/goods.vue

@@ -140,7 +140,8 @@
 				goodtype: 'normal', //商品类型
 				length: '',
 				width: '',
-				height: ''
+				height: '',
+				typea:''
 			};
 		},
 		computed: {
@@ -160,6 +161,11 @@
 				this.weight = goodinfo.weight
 				this.width = goodinfo.width
 			}
+			if(options.goodtype){
+				this.goodtype = options.goodtype
+				console.log(this.goodtype);
+				this.typea = 'pin'
+			}
 			this.getgoods()
 		},
 		onShow() {
@@ -209,7 +215,11 @@
 			},
 			//商品类型
 			type(type) {
-				this.goodtype = type
+				if(this.typea == 'pin'){
+					
+				}else{
+					this.goodtype = type
+				}
 			},
 			//选中哪个物品
 			activename(item) {

pageC/ensureMoney/ensureMoney.vue

@@ -111,7 +111,7 @@ export default {
       });
     },
   },
-  mounted() {
+  onShow() {
     this.getMoneyList();
     this.getUserInfo();
   },

pageC/recharge/recharge.vue

@@ -1,241 +1,220 @@
 <template>
-  <view class="recharge">
-    <view class="mine"> 我的余额（元） </view>
-    <view class="money">{{ userInformation.balance }}</view>
-    <view class="to-withdrawal">
-      <AllRight name="去提现" :withdrawal="true" @toDetail="toWithdrawal" />
-    </view>
-    <view class="select-money">
-      <view class="title"> 余额账户充值 </view>
-      <!-- 选择充值金额 -->
-      <view class="select-recharge">
-        <view
-          class="recharge-money"
-          :class="{ 'back-red': backgroundRed == 100 }"
-          @click="selectMoney(100)"
-        >
-          <text>￥</text>100
-        </view>
-        <view
-          class="recharge-money"
-          :class="{ 'back-red': backgroundRed == 200 }"
-          @click="selectMoney(200)"
-        >
-          <text>￥</text>200
-        </view>
-        <view
-          class="recharge-money"
-          :class="{ 'back-red': backgroundRed == 300 }"
-          @click="selectMoney(300)"
-        >
-          <text>￥</text>300
-        </view>
-        <view
-          class="recharge-money"
-          :class="{ 'back-red': backgroundRed == 600 }"
-          @click="selectMoney(600)"
-        >
-          <text>￥</text>600
-        </view>
-        <view
-          class="recharge-money"
-          :class="{ 'back-red': backgroundRed == 800 }"
-          @click="selectMoney(800)"
-        >
-          <text>￥</text>800
-        </view>
-        <view
-          class="recharge-money"
-          :class="{ 'back-red': backgroundRed == 1000 }"
-          @click="selectMoney(1000)"
-        >
-          <text>￥</text>1000
-        </view>
-      </view>
-      <!-- 选择充值金额 -->
-      <u--input
-        placeholder="输入自定义金额"
-        prefixIcon="rmb"
-        v-model="rmb"
-        prefixIconStyle="font-size: 36rpx;color: #000;font-weight:600"
-      ></u--input>
-
-      <view class="payment">
-        <view class="title"> 支付方式 </view>
-        <view class="wx-pay">
-          <view class="logo">
-            <image
-              src="../../static/mine/323.png"
-              class="wx-logo"
-              mode=""
-            ></image>
-            微信支付
-          </view>
-          <image
-            src="../../static/mine/330.png"
-            mode="scaleToFill"
-            class="wx-logo"
-          />
-        </view>
-      </view>
-      <button class="recharge-btn" @click="recharge">充值</button>
-    </view>
-  </view>
+	<view class="recharge">
+		<view class="mine"> 我的余额（元） </view>
+		<view class="money">{{ userInformation.balance }}</view>
+		<view class="to-withdrawal">
+			<AllRight name="去提现" :withdrawal="true" @toDetail="toWithdrawal" />
+		</view>
+		<view class="select-money">
+			<view class="title"> 余额账户充值 </view>
+			<!-- 选择充值金额 -->
+			<view class="select-recharge">
+				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 100 }" @click="selectMoney(100)">
+					<text>￥</text>100
+				</view>
+				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 200 }" @click="selectMoney(200)">
+					<text>￥</text>200
+				</view>
+				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 300 }" @click="selectMoney(300)">
+					<text>￥</text>300
+				</view>
+				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 600 }" @click="selectMoney(600)">
+					<text>￥</text>600
+				</view>
+				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 800 }" @click="selectMoney(800)">
+					<text>￥</text>800
+				</view>
+				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 1000 }" @click="selectMoney(1000)">
+					<text>￥</text>1000
+				</view>
+			</view>
+			<!-- 选择充值金额 -->
+			<u--input placeholder="输入自定义金额" prefixIcon="rmb" v-model="rmb"
+				prefixIconStyle="font-size: 36rpx;color: #000;font-weight:600"></u--input>
+
+			<view class="payment">
+				<view class="title"> 支付方式 </view>
+				<view class="wx-pay">
+					<view class="logo">
+						<image src="../../static/mine/323.png" class="wx-logo" mode=""></image>
+						微信支付
+					</view>
+					<image src="../../static/mine/330.png" mode="scaleToFill" class="wx-logo" />
+				</view>
+			</view>
+			<button class="recharge-btn" @click="recharge">充值</button>
+		</view>
+	</view>
 </template>
 
 <script>
-import AllRight from "../mineComponent/allRight/allRight.vue";
-
-export default {
-  components: {
-    AllRight,
-  },
-  data() {
-    return {
-      backgroundRed: 0,
-      rmb: "",
-      userInformation: {},
-    };
-  },
-  onShow() {
-    this.getBalance();
-  },
-  methods: {
-    selectMoney(num) {
-      this.backgroundRed = num;
-    },
-    toWithdrawal() {
-      uni.navigateTo({
-        url: "/pageC/withdrawal/withdrawal?type=balance",
-      });
-    },
-    //充值
-    recharge() {
-      let num = this.rmb == "" ? this.backgroundRed : this.rmb;
-      uni.$u.http
-        .post(`/api/recharge`, {
-          account_type: "balance",
-          amount: num,
-        })
-        .then((res) => {
-          console.log(res);
-        });
-    },
-    //获取账户余额
-    getBalance() {
-      uni.$u.http.get(`/api/member/info`).then((res) => {
-        this.userInformation = res;
-      });
-    },
-  },
-};
+	import AllRight from "../mineComponent/allRight/allRight.vue";
+
+	export default {
+		components: {
+			AllRight,
+		},
+		data() {
+			return {
+				backgroundRed: 0,
+				rmb: "",
+				userInformation: {},
+			};
+		},
+		onShow() {
+			this.getBalance();
+		},
+		methods: {
+			selectMoney(num) {
+				this.backgroundRed = num;
+			},
+			toWithdrawal() {
+				uni.navigateTo({
+					url: "/pageC/withdrawal/withdrawal?type=balance",
+				});
+			},
+			//充值
+			recharge() {
+				let num = this.rmb == "" ? this.backgroundRed : this.rmb;
+				uni.$u.http
+					.post(`/api/recharge`, {
+						account_type: "balance",
+						amount: num,
+					})
+					.then((res) => {
+						uni.requestPayment({
+							provider: 'wxpay',
+							timeStamp: String(res.timeStamp),
+							nonceStr: res.nonceStr,
+							package: res.package,
+							signType: res.signType,
+							paySign: res.paySign,
+							success: function(res) {
+								console.log('success:' + JSON.stringify(res));
+								uni.navigateBack()
+							},
+							fail: function(err) {
+								console.log('fail:' + JSON.stringify(err));
+							}
+						});
+						console.log(res);
+					});
+			},
+			//获取账户余额
+			getBalance() {
+				uni.$u.http.get(`/api/member/info`).then((res) => {
+					this.userInformation = res;
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.recharge {
-  height: 100vh;
-  background-color: #fff;
-
-  .mine {
-    padding-top: 63rpx;
-    text-align: center;
-    color: #222;
-    font-size: 28rpx;
-    border-top: 1px solid #ccc;
-  }
-
-  .money {
-    font-size: 84rpx;
-    text-align: center;
-    color: #222;
-    font-weight: 600;
-    margin-top: 28rpx;
-    margin-bottom: 20rpx;
-  }
-
-  .to-withdrawal {
-    display: flex;
-    justify-content: center;
-  }
-
-  .select-money {
-    padding-top: 42rpx;
-    border-top: 1px solid #ccc;
-    margin: 0 auto;
-    margin-top: 64rpx;
-    width: 94%;
-
-    .title {
-      font-size: 32rpx;
-      color: #222;
-      font-weight: 500;
-      margin-bottom: 36rpx;
-    }
-
-    .payment {
-      margin-top: 46rpx;
-
-      .wx-pay {
-        height: 100rpx;
-        background-color: #f4f4f4;
-        width: 94%;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 0 20rpx;
-        font-size: 32rpx;
-
-        .logo {
-          display: flex;
-          align-items: center;
-        }
-
-        .wx-logo {
-          width: 39rpx;
-          height: 34rpx;
-          margin-right: 18rpx;
-        }
-      }
-    }
-
-    .recharge-btn {
-      background-color: #f83224;
-      border-radius: 44rpx;
-      color: #fff;
-      margin-top: 150rpx;
-    }
-
-    .select-recharge {
-      display: flex;
-      justify-content: space-between;
-      flex-wrap: wrap;
-
-      .recharge-money {
-        width: 210rpx;
-        height: 120rpx;
-        border: 1px solid #f83224;
-        border-radius: 16rpx;
-        text-align: center;
-        line-height: 120rpx;
-        font-size: 40rpx;
-        font-weight: 600;
-        margin-bottom: 26rpx;
-
-        text {
-          font-size: 24rpx;
-        }
-      }
-
-      .back-red {
-        background-color: #f83224;
-        color: #fff;
-      }
-    }
-  }
-}
-
-/deep/.u-input {
-  background-color: #f4f4f4;
-  height: 80rpx;
-}
-</style>
+	.recharge {
+		height: 100vh;
+		background-color: #fff;
+
+		.mine {
+			padding-top: 63rpx;
+			text-align: center;
+			color: #222;
+			font-size: 28rpx;
+			border-top: 1px solid #ccc;
+		}
+
+		.money {
+			font-size: 84rpx;
+			text-align: center;
+			color: #222;
+			font-weight: 600;
+			margin-top: 28rpx;
+			margin-bottom: 20rpx;
+		}
+
+		.to-withdrawal {
+			display: flex;
+			justify-content: center;
+		}
+
+		.select-money {
+			padding-top: 42rpx;
+			border-top: 1px solid #ccc;
+			margin: 0 auto;
+			margin-top: 64rpx;
+			width: 94%;
+
+			.title {
+				font-size: 32rpx;
+				color: #222;
+				font-weight: 500;
+				margin-bottom: 36rpx;
+			}
+
+			.payment {
+				margin-top: 46rpx;
+
+				.wx-pay {
+					height: 100rpx;
+					background-color: #f4f4f4;
+					width: 94%;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					padding: 0 20rpx;
+					font-size: 32rpx;
+
+					.logo {
+						display: flex;
+						align-items: center;
+					}
+
+					.wx-logo {
+						width: 39rpx;
+						height: 34rpx;
+						margin-right: 18rpx;
+					}
+				}
+			}
+
+			.recharge-btn {
+				background-color: #f83224;
+				border-radius: 44rpx;
+				color: #fff;
+				margin-top: 150rpx;
+			}
+
+			.select-recharge {
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;
+
+				.recharge-money {
+					width: 210rpx;
+					height: 120rpx;
+					border: 1px solid #f83224;
+					border-radius: 16rpx;
+					text-align: center;
+					line-height: 120rpx;
+					font-size: 40rpx;
+					font-weight: 600;
+					margin-bottom: 26rpx;
+
+					text {
+						font-size: 24rpx;
+					}
+				}
+
+				.back-red {
+					background-color: #f83224;
+					color: #fff;
+				}
+			}
+		}
+	}
+
+	/deep/.u-input {
+		background-color: #f4f4f4;
+		height: 80rpx;
+	}
+</style>

pageD/ensureRecharge/ensureRecharge.vue

@@ -1,105 +1,141 @@
 <template>
-  <view class="withdrawal">
-    <!-- 头部 -->
-    <view class="withdrawal-top">
-      <view class="title"> 支付方式 </view>
-      <view class="wx">
-        <image src="../../static/mine/323.png" class="wx-logo" mode=""></image>
-        <text>微信余额</text>
-      </view>
-    </view>
-    <!-- 充值头部 -->
-    <view class="content">
-      <view class="money"> 充值金额 </view>
-      <view class="inp">
-        <text>￥</text>
-        <input type="text" />
-      </view>
-      <button class="immediately">立即充值</button>
-    </view>
-  </view>
+	<view class="withdrawal">
+		<!-- 头部 -->
+		<view class="withdrawal-top">
+			<view class="title"> 支付方式 </view>
+			<view class="wx">
+				<image src="../../static/mine/323.png" class="wx-logo" mode=""></image>
+				<text>微信余额</text>
+			</view>
+		</view>
+		<!-- 充值头部 -->
+		<view class="content">
+			<view class="money"> 充值金额 </view>
+			<view class="inp">
+				<text>￥</text>
+				<input type="text" v-model="mon" />
+			</view>
+			<button class="immediately" @click="recharge">立即充值</button>
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {};
-  },
-  methods: {
-    toWithdrawalDetail() {
-      uni.navigateTo({
-        url: "/pageC/withdrawalDetail/withdrawalDetail",
-      });
-    },
-  },
-  mounted() {
-    uni.setNavigationBarTitle({
-      title: "保证金充值",
-    });
-  },
-};
+	export default {
+		data() {
+			return {
+				mon: ''
+			};
+		},
+		methods: {
+			//充值
+			recharge() {
+				uni.$u.http
+					.post(`/api/recharge`, {
+						account_type: "deposit",
+						amount: this.mon,
+					})
+					.then((res) => {
+						uni.requestPayment({
+							provider: 'wxpay',
+							timeStamp:String(res.timeStamp),
+							nonceStr: res.nonceStr,
+							package: res.package,
+							signType: res.signType,
+							paySign: res.paySign,
+							success: function(res) {
+								console.log('success:' + JSON.stringify(res));
+								uni.navigateBack()
+							},
+							fail: function(err) {
+								console.log('fail:' + JSON.stringify(err));
+							}
+						});
+						console.log(res);
+					});
+			},
+			toWithdrawalDetail() {
+				uni.navigateTo({
+					url: "/pageC/withdrawalDetail/withdrawalDetail",
+				});
+			},
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title: "保证金充值",
+			});
+		},
+	};
 </script>
 
 <style scoped lang="scss">
-.withdrawal {
-  padding: 20rpx 24rpx 0;
+	.withdrawal {
+		padding: 20rpx 24rpx 0;
 
-  .withdrawal-top {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    height: 104rpx;
-    background-color: #fff;
-    border-radius: 16rpx;
-    padding: 0 24rpx;
-    .title {
-      font-size: 30rpx;
-    }
+		.withdrawal-top {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			height: 104rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 0 24rpx;
 
-    .wx {
-      display: flex;
-      align-items: center;
-      height: 50rpx;
-      .wx-logo {
-        width: 40rpx;
-        height: 40rpx;
-        margin-right: 10rpx;
-      }
-    }
-  }
-  .content {
-    background-color: #fff;
-    border-radius: 16rpx;
-    margin-top: 16rpx;
-    padding: 32rpx 24rpx 46rpx;
-    .money {
-      font-size: 30rpx;
-    }
-    .inp {
-      display: flex;
-      height: 110rpx;
-      align-items: center;
-      border-bottom: 2rpx solid rgba(151, 151, 151, 0.3);
-      margin-bottom: 18rpx;
-    }
-    .all-money {
-      font-size: 24rpx;
-      color: #555;
-    }
-    .immediately {
-      box-shadow: 0rpx 12rpx 28rpx -12rpx #f83224;
-      border-radius: 44rpx;
-      background-color: #f83224;
-      color: #fff;
-      margin-top: 60rpx;
-      margin-bottom: 60rpx;
-    }
-    .detail {
-      text-align: center;
-      font-size: 26rpx;
-      opacity: 0.6;
-      color: #131415;
-    }
-  }
-}
-</style>
+			.title {
+				font-size: 30rpx;
+			}
+
+			.wx {
+				display: flex;
+				align-items: center;
+				height: 50rpx;
+
+				.wx-logo {
+					width: 40rpx;
+					height: 40rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+
+		.content {
+			background-color: #fff;
+			border-radius: 16rpx;
+			margin-top: 16rpx;
+			padding: 32rpx 24rpx 46rpx;
+
+			.money {
+				font-size: 30rpx;
+			}
+
+			.inp {
+				display: flex;
+				height: 110rpx;
+				align-items: center;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.3);
+				margin-bottom: 18rpx;
+			}
+
+			.all-money {
+				font-size: 24rpx;
+				color: #555;
+			}
+
+			.immediately {
+				box-shadow: 0rpx 12rpx 28rpx -12rpx #f83224;
+				border-radius: 44rpx;
+				background-color: #f83224;
+				color: #fff;
+				margin-top: 60rpx;
+				margin-bottom: 60rpx;
+			}
+
+			.detail {
+				text-align: center;
+				font-size: 26rpx;
+				opacity: 0.6;
+				color: #131415;
+			}
+		}
+	}
+</style>

pageD/evaluate/evaluate.vue

@@ -12,8 +12,8 @@
 			<!-- accept="all" 可以上传视频是配置该字段 -->
 			<!-- 			<u-upload :previewFullImage='true' @clickPreview="openvideo" accept="all" :fileList="item.list" @afterRead="afterRead" @delete="deletePic" :name="idx" multiple
 				:maxCount="10"> -->
-			<u-upload :fileList="fileList0" @afterRead="afterRead" @delete="deletePic" name="0" multiple :maxCount="10"
-				accept="all">
+			<u-upload accept=" image/*,video/*" :fileList="fileList0" @afterRead="afterRead" @delete="deletePic" name="0" multiple :maxCount="10"
+				>
 				<view class="upload-photo">
 					<u-icon name="camera" size="26"></u-icon>
 					<text>添加图片/视频</text>
@@ -23,7 +23,7 @@
 				<u--textarea border="none" v-model="value1" height="150" placeholder="展开说说对商品的想法"></u--textarea>
 			</view>
 		</view>
-		<button class="btn-1" @click="submit">提交评价</button>
+		<button class="btn-1" @click="submit">提交评价</button>   
 	</view>
 </template>
 

pages/cart/cart.vue

@@ -1,929 +1,843 @@
 <template>
-  <!-- 购物车 -->
-  <view class="page" @click="num = ''">
-    <u-navbar :safeAreaInsetTop="true" :placeholder="true">
-      <view class="u-nav-slot" slot="left">
-        <view class="">
-          <text class="shopcart">{{ i18n.Shopping }}</text>
-          <text class="sum">({{ goodsNum }})</text>
-        </view>
-      </view>
-      <view class="u-nav-slot" slot="right">
-        <view class="u-flex">
-          <text @click="admin" v-if="success">{{ i18n.manage }}</text>
-          <text @click="admin" v-else>{{ i18n.complete }}</text>
-          <view class="" style="width: 200rpx"></view>
-        </view>
-      </view>
-    </u-navbar>
-    <u-checkbox-group
-      v-model="checkboxValue1"
-      placement="column"
-      @change="checkboxChange"
-    >
-      <view class="box" v-for="(item, idx) in goodsList" :key="idx">
-        <view class="item">
-          <view class="shopname u-flex">
-            <image
-              src="/static/mine/354.png"
-              class="circle"
-              mode="scaleToFill"
-              @click="shopSelectAll(item.goods)"
-              v-if="shop(item.goods)"
-            />
-            <image
-              src="/static/mine/353.png"
-              class="circle"
-              mode="scaleToFill"
-              @click="shopSelectAll(item.goods)"
-              v-else
-            />
-
-            <image
-              :src="item.image"
-              style="width: 28rpx; height: 28rpx"
-              mode=""
-            ></image>
-            <text>{{ item.merchant_name }}</text>
-            <image
-              src="/static/express/next1.png"
-              style="width: 32rpx; height: 32rpx"
-              mode=""
-            ></image>
-          </view>
-          <u-swipe-action>
-            <view
-              class="u-flex"
-              style="margin-top: 30rpx; width: 100%"
-              v-for="(chid, index) in item.goods"
-              :key="index"
-            >
-              <u-swipe-action-item
-                ref="show"
-                :options="options2"
-                @click="followOrdelete"
-                :autoClose="true"
-                :name="chid.cart.id"
-                :disabled="chid.status == 'down' || chid.sku_item.length == 0"
-              >
-                <!-- 				<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.id"
-                  activeColor="#F83224"
-                  :disabled="chid.status == 'down' || chid.sku_item.length == 0"
-                >
-                </u-checkbox>
-                <view
-                  class=""
-                  style="
+	<!-- 购物车 -->
+	<view class="page" @click="num = ''">
+		<u-navbar :safeAreaInsetTop="true" :placeholder="true">
+			<view class="u-nav-slot" slot="left">
+				<view class="">
+					<text class="shopcart">{{ i18n.Shopping }}</text>
+					<text class="sum">({{ goodsNum }})</text>
+				</view>
+			</view>
+			<view class="u-nav-slot" slot="right">
+				<view class="u-flex">
+					<text @click="admin" v-if="success">{{ i18n.manage }}</text>
+					<text @click="admin" v-else>{{ i18n.complete }}</text>
+					<view class="" style="width: 200rpx"></view>
+				</view>
+			</view>
+		</u-navbar>
+		<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+			<view class="box" v-for="(item, idx) in goodsList" :key="idx">
+				<view class="item">
+					<view class="shopname u-flex">
+						<image src="/static/mine/354.png" class="circle" mode="scaleToFill"
+							@click="shopSelectAll(item.goods)" v-if="shop(item.goods)" />
+						<image src="/static/mine/353.png" class="circle" mode="scaleToFill"
+							@click="shopSelectAll(item.goods)" v-else />
+
+						<image :src="item.image" style="width: 28rpx; height: 28rpx" mode=""></image>
+						<text>{{ item.merchant_name }}</text>
+						<image src="/static/express/next1.png" style="width: 32rpx; height: 32rpx" mode=""></image>
+					</view>
+					<u-swipe-action>
+						<view class="u-flex" style="margin-top: 30rpx; width: 100%" v-for="(chid, index) in item.goods"
+							:key="index">
+							<u-swipe-action-item ref="show" :options="options2" @click="followOrdelete"
+								:autoClose="true" :name="chid.cart.id"
+								:disabled="chid.status == 'down' || chid.sku_item.length == 0">
+								<!-- 				<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.id"
+									activeColor="#F83224"
+									:disabled="chid.status == 'down' || chid.sku_item.length == 0">
+								</u-checkbox>
+								<view class="" style="
                     position: relative;
                     width: 172rpx;
                     height: 172rpx;
                     border-radius: 16rpx;
-                  "
-                >
-                  <image
-                    :src="chid.sku_item[0].image"
-                    style="width: 172rpx; height: 172rpx; border-radius: 20rpx"
-                    mode=""
-                  >
-                  </image>
-                  <view
-                    class="down"
-                    v-if="chid.status == 'down' || chid.sku_item.length == 0"
-                  >
-                    <view class="sold"> {{ i18n.offtheshelves }} </view>
-                  </view>
-                </view>
-                <view
-                  class="good"
-                  style="flex: 1; margin-left: 10rpx; width: 65%"
-                >
-                  <view class="goodname">{{ chid.name_cn }}</view>
-                  <view class="goods" v-if="chid.sku_item.length > 0">{{
-                    chid.sku_item[0].item
-                  }}</view>
-                  <view class="" style="margin-top: 21rpx">
-                    <view
-                      class="goodtab"
-                      v-for="itemLabel in chid.label_arr"
-                      :key="itemLabel.id"
-                    >
-                      {{ itemLabel.name_cn }}
-                    </view>
-                  </view>
-                  <view
-                    class="u-flex u-row-between"
-                    style="width: 100%; margin-top: 20rpx"
-                  >
-                    <view class="" v-if="chid.sku_item.length > 0">
-                      <text class="money">¥</text>
-                      <text class="money" style="font-size: 30rpx">{{
-                        chid.sku_item[0].discount_price.split(".")[0]
+                  ">
+									<image :src="chid.sku_item[0].image"
+										style="width: 172rpx; height: 172rpx; border-radius: 20rpx" mode="">
+									</image>
+									<view class="down" v-if="chid.status == 'down' || chid.sku_item.length == 0">
+										<view class="sold"> {{ i18n.offtheshelves }} </view>
+									</view>
+								</view>
+								<view class="good" style="flex: 1; margin-left: 10rpx; width: 65%">
+									<view class="goodname" v-if="language == 'zh-CN'">{{ chid.name_cn }}</view>
+									<view class="goodname" v-if="language == 'en-US'">{{ chid.name_en }}</view>
+									<view class="goodname" v-if="language == 'es-ES'">{{ chid.name_es }}</view>
+									<view class="goodname" v-if="language == 'it-IT'">{{ chid.name_ita }}</view>
+									<view class="goods" v-if="chid.sku_item.length > 0">
+										<text v-if="language == 'zh-CN'">{{chid.sku_item[0].item}}</text>
+										<text v-if="language == 'en-US'">{{chid.sku_item[0].item_en}}</text>  
+										<text v-if="language == 'es-ES'">{{chid.sku_item[0].item_es}}</text>
+										<text v-if="language == 'it-IT'">{{chid.sku_item[0].item_ita}}</text>
+									</view>
+									<view class="" style="margin-top: 21rpx">
+										<view class="goodtab" v-for="itemLabel in chid.label_arr" :key="itemLabel.id">
+											<text v-if="language == 'zh-CN'">{{ itemLabel.name_cn }}</text>
+											<text v-if="language == 'en-US'">{{ itemLabel.name_en }}</text>
+											<text v-if="language == 'es-ES'">{{ itemLabel.name_es }}</text>
+											<text v-if="language == 'it-IT'">{{ itemLabel.name_ita }}</text>
+										</view>
+									</view>
+									<view class="u-flex u-row-between" style="width: 100%; margin-top: 20rpx">
+										<view class="" v-if="chid.sku_item.length > 0">
+											<text class="money">¥</text>
+											<text class="money" style="font-size: 30rpx">{{
+                        chid.sku_item[0].discount_price.split(".")[0]    
                       }}</text>
-                      <text class="money"
-                        >.{{
+											<text class="money">.{{
                           chid.sku_item[0].discount_price.split(".")[1]
-                        }}</text
-                      >
-                      <text class="weight"
-                        >{{ chid.sku_item[0].weight }}kg</text
-                      >
-                    </view>
-                    <view class="aaaaaa">
-                      <!-- <view class="delect" v-if='dele'>{{i18n.delete}}</view> -->
-                      <view class="" v-if="num == chid.cart.id && success">
-                        <!-- <u-number-box v-model="value" @change="valChange"></u-number-box> -->
-                        <u-number-box
-                          v-model="chid.cart.goods_num"
-                          @change="addOrReduce"
-                        >
-                          <view slot="minus" class="minus">
-                            <u-icon
-                              name="minus"
-                              color="#B5B5B5"
-                              size="12"
-                            ></u-icon>
-                          </view>
-                          <text
-                            slot="input"
-                            style="
+                        }}</text>
+											<text class="weight">{{ chid.sku_item[0].weight }}kg</text>
+										</view>
+										<view class="aaaaaa">
+											<!-- <view class="delect" v-if='dele'>{{i18n.delete}}</view> -->
+											<view class="" v-if="num == chid.cart.id && success">
+												<!-- <u-number-box v-model="value" @change="valChange"></u-number-box> -->
+												<u-number-box v-model="chid.cart.goods_num" @change="addOrReduce">
+													<view slot="minus" class="minus">
+														<u-icon name="minus" color="#B5B5B5" size="12"></u-icon>
+													</view>
+													<text slot="input" style="
                               width: 50px;
                               text-align: center;
                               font-size: 20rpx;
-                            "
-                            class="input"
-                            >{{ chid.cart.goods_num }}</text
-                          >
-                          <view slot="plus" class="plus">
-                            <u-icon
-                              name="plus"
-                              color="#B5B5B5"
-                              size="12"
-                            ></u-icon>
-                          </view>
-                        </u-number-box>
-                      </view>
-                      <view
-                        class="num"
-                        v-if="
+                            " class="input">{{ chid.cart.goods_num }}</text>
+													<view slot="plus" class="plus">
+														<u-icon name="plus" color="#B5B5B5" size="12"></u-icon>
+													</view>
+												</u-number-box>
+											</view>
+											<view class="num" v-if="
                           num != chid.cart.id &&
                           success &&
                           chid.status == 'normal' &&
                           chid.sku_item.length != 0
-                        "
-                        @click.stop="num = chid.cart.id"
-                      >
-                        x{{ chid.cart.goods_num }}
-                      </view>
-                      <view
-                        v-if="
+                        " @click.stop="num = chid.cart.id">
+												x{{ chid.cart.goods_num }}
+											</view>
+											<view v-if="
                           success &&
                           (chid.status == 'down' || chid.sku_item.length == 0)
-                        "
-                        class="del"
-                        @click="
+                        " class="del" @click="
                           followOrdelete({
                             index: 1,
                             name: chid.cart.id,
                           })
-                        "
-                        >{{ i18n.delete }}</view
-                      >
-                    </view>
-                    <view
-                      v-if="success == false"
-                      class="icon delete-1"
-                      @click="
+                        ">{{ i18n.delete }}</view>
+										</view>
+										<view v-if="success == false" class="icon delete-1" @click="
                         followOrdelete({
                           index: 1,
                           name: chid.cart.id,
                         })
-                      "
-                    >
-                      <u-icon name="trash" color="#fff" size="20"></u-icon>
-                    </view>
-                  </view>
-                </view>
-              </u-swipe-action-item>
-            </view>
-          </u-swipe-action>
-        </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">{{ i18n.top }}</text>
-    </view>
-    <kj-tabbar
-      ref="tabbar1"
-      :value1="3"
-      :success="success"
-      @allSelect="allSelect"
-      :goodsWeight="goodsWeight"
-      :goodsPrice="String(goodsPrice.toFixed(2))"
-      :goodsList="goodsList"
-      :checkboxValue1="checkboxValue1"
-      @selectDelete="selectDelete"
-    ></kj-tabbar>
-  </view>
+                      ">
+											<u-icon name="trash" color="#fff" size="20"></u-icon>
+										</view>
+									</view>
+								</view>
+							</u-swipe-action-item>
+						</view>
+					</u-swipe-action>
+				</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">{{ i18n.top }}</text>
+		</view>
+		<kj-tabbar ref="tabbar1" :value1="3" :success="success" @allSelect="allSelect" :goodsWeight="goodsWeight"
+			:goodsPrice="String(goodsPrice.toFixed(2))" :goodsList="goodsList" :checkboxValue1="checkboxValue1"
+			@selectDelete="selectDelete"></kj-tabbar>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      dele: true,
-      success: true,
-      shopitem: -1,
-      checkboxValue1: [], //商品数组
-      value: 0,
-      all: [], //全选数组
-      goodsList: [],
-      selectall: -1,
-      goodsNum: 0, //购物车商品数量
-      num: false,
-      goodsWeight: 0, //商品重量
-      goodsPrice: 0, //商品价格
-      tabarheight: "",
-      removeProducts: 0, //已下架的商品数量
-    };
-  },
-  watch: {},
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-    options2() {
-      var options = [
-        {
-          text: this.i18n.Shiftfocus,
-          style: {
-            backgroundColor: "#FFB115",
-          },
-        },
-        {
-          text: this.i18n.delete,
-          style: {
-            backgroundColor: "#F83224",
-          },
-        },
-      ];
-      return options;
-    },
-  },
-  onLoad() {
-    const systemInfo = wx.getSystemInfoSync();
-    const tab =
-      systemInfo.screenHeight -
-      systemInfo.safeArea.bottom +
-      systemInfo.statusBarHeight;
-    this.tabarheight = tab;
-  },
-  onShow() {
-    this.goodsNum = 0; //购物车商品数量
-    this.goodsWeight = 0; //商品重量
-    this.goodsPrice = 0; //商品价格
-    this.checkboxValue1 = [];
-    this.getShopCarList();
-  },
-  methods: {
-    //返回顶部
-    backTop() {
-      uni.pageScrollTo({
-        scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
-        duration: 300, // 滚动动画的时长
-      });
-    },
-    //商品下架之后的商品字体颜色
-    getFontColor(status) {
-      if (status == "down") {
-        return "color:rgba(51, 51, 51, .6)";
-      }
-    },
-
-    //关注商品 or 删除商品
-    followOrdelete(e) {
-      //关注商品
-      if (e.index == 0) {
-        this.goodsList.map((item) => {
-          item.goods.map((items) => {
-            if (e.name == items.cart.id) {
-              console.log(items);
-              uni.$u.http
-                .post(`/api/interest/follow`, {
-                  interest_type: 0,
-                  interest_id: items.merchant_goods.id,
-                })
-                .then((res) => {
-                  this.$refs.show.forEach((item) => item.closeHandler(true));
-                  console.log(res);
-                  uni.showToast({
-                    title: "关注成功",
-                    icon: "none",
-                  });
-                });
-            }
-          });
-        });
-      } else {
-        //删除商品
-        this.goodsList.map((item) => {
-          item.goods.map((items) => {
-            if (e.name == items.cart.id) {
-              uni.$u.http
-                .delete(`/api/cart?ids=${items.cart.id}`)
-                .then((res) => {
-                  this.$refs.uToast.show({
-                    type: "default",
-                    title: this.i18n.defaultTheme,
-                    message: this.i18n.successfullydelete,
-                  });
-                  //删除后关闭滑动打开的单元格
-                  this.$refs.show.forEach((item) => item.closeHandler(true));
-                  this.getShopCarList();
-                });
-            }
-          });
-        });
-      }
-    },
-
-    //多选删除
-    selectDelete() {
-      let goodsIdList = []; //筛选选中的商品id
-      this.goodsList.map((item) => {
-        item.goods.map((items) => {
-          if (this.checkboxValue1.indexOf(items.cart.id) >= 0) {
-            goodsIdList.push(items.cart.id);
-          }
-        });
-      });
-      uni.$u.http
-        .delete(`/api/cart`, {
-          ids: goodsIdList.join(","),
-        })
-        .then((res) => {
-          this.$refs.uToast.show({
-            type: "default",
-            title: this.i18n.defaultTheme,
-            message: this.i18n.successfullydelete,
-          });
-          this.checkboxValue1 = [];
-          this.getShopCarList();
-        });
-    },
-
-    shop(value) {
-      let num = 0;
-      value.map((item) => {
-        if (this.checkboxValue1.indexOf(item.cart.id) >= 0) {
-          num++;
-        }
-      });
-      return num;
-    },
-
-    //获取排除下架的商品之后的商品数量
-    getNormalGoodsNum(value) {
-      let num = 0;
-      value.map((item) => {
-        if (item.status != "down") {
-          num++;
-        }
-      });
-      return num;
-    },
-
-    //修改购物车商品数量
-    addOrReduce(n) {
-      console.log(n);
-      uni.$u.http
-        .post(`/api/cart/num/${this.num}`, {
-          goods_num: n.value,
-          type: "",
-        })
-        .then((res) => {
-          this.goodsPrice = 0;
-          this.goodsWeight = 0;
-          this.goodsList.map((item) => {
-            item.goods.map((items) => {
-              //判断是否有商品已被选中
-              if (
-                this.checkboxValue1.indexOf(items.cart.id) != -1 &&
-                items.status != "down"
-              ) {
-                this.goodsWeight +=
-                  items.sku_item[0].weight * items.cart.goods_num;
-                this.goodsPrice +=
-                  Number(items.sku_item[0].discount_price) *
-                  items.cart.goods_num;
-              }
-            });
-          });
-        });
-    },
-
-    //店铺商品全选
-    shopSelectAll(value) {
-      this.goodsPrice = 0;
-      this.goodsWeight = 0;
-      //先判断存放选中的数组有没有选中的数据
-      if (this.checkboxValue1.length == 0) {
-        //没有数据则直接将选中店铺中的商品存入数组
-        value.map((item) => {
-          //商品下架不得选中
-          if (item.status != "down") {
-            this.checkboxValue1.push(item.cart.id);
-          }
-        });
-      } else {
-        if (
-          this.shop(value) > 0 &&
-          this.shop(value) == this.getNormalGoodsNum(value)
-        ) {
-          value.map((item) => {
-            //先判断选中的商品数组中该店铺商品是否已被选中，已被选中则取消选中
-            if (this.checkboxValue1.indexOf(item.cart.id) >= 0) {
-              this.checkboxValue1.splice(
-                this.checkboxValue1.indexOf(item.cart.id),
-                1
-              );
-            }
-          });
-        } else if (
-          (this.shop(value) > 0 &&
-            this.shop(value) != this.getNormalGoodsNum(value)) ||
-          this.shop(value) == 0
-        ) {
-          value.map((item) => {
-            //先判断选中的商品数组中该店铺商品是否已被选中，未被选中则推入选中状态，商品下架不得选中
-            if (
-              this.checkboxValue1.indexOf(item.cart.id) == -1 &&
-              item.status != "down"
-            ) {
-              this.checkboxValue1.push(item.cart.id);
-            }
-          });
-        }
-      }
-      if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
-        this.$refs.tabbar1.cancelAll();
-      } else {
-        this.$refs.tabbar1.cancelAll(this.i18n.Cancel);
-      }
-
-      //将选中的商品价格相加
-      this.goodsList.map((item) => {
-        item.goods.map((items) => {
-          if (this.checkboxValue1.indexOf(items.cart.id) > -1) {
-            this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
-            this.goodsPrice +=
-              Number(items.sku_item[0].discount_price) * items.cart.goods_num;
-          }
-        });
-      });
-      this.shop(value);
-    },
-    admin() {
-      console.log(this.checkboxValue1);
-      this.success = !this.success;
-    },
-    valChange(e) {
-      console.log("当前值为: " + e.value);
-    },
-    //全选
-    checkAll(e) {
-      console.log("all", e);
-    },
-    //购物车单选
-    checkboxChange(n) {
-      console.log(n);
-      //首先将价格和商品重量重置
-      this.goodsWeight = 0;
-      this.goodsPrice = 0;
-      this.checkboxValue1 = n;
-      this.goodsList.map((item) => {
-        item.goods.map((items) => {
-          if (n.indexOf(items.cart.id) > -1) {
-            this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
-            this.goodsPrice +=
-              Number(items.sku_item[0].discount_price) * items.cart.goods_num;
-          }
-        });
-      });
-      //判断是否全部选中
-      if (
-        this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
-        this.goodsNum != 0
-      ) {
-        this.$refs.tabbar1.cancelAll();
-      } else if (
-        this.checkboxValue1.length <
-        this.goodsNum - this.removeProducts
-      ) {
-        this.$refs.tabbar1.cancelAll(this.i18n.Cancel);
-      }
-    },
-    //购物车全选
-    allSelect() {
-      const all = this.$refs.tabbar1.cancelAll(this.i18n.selectall);
-      if (
-        this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
-        all.length == 0
-      ) {
-        return;
-      }
-      //判断是否已经全选，如已全选，则取消全选
-      if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
-        this.checkboxValue1 = [];
-        this.goodsPrice = 0;
-        this.goodsWeight = 0;
-      } else {
-        this.goodsList.map((item) => {
-          item.goods.map((items) => {
-            //判断是否有商品已被选中
-            if (
-              this.checkboxValue1.indexOf(items.cart.id) == -1 &&
-              items.status != "down"
-            ) {
-              this.checkboxValue1.push(items.cart.id);
-              this.goodsWeight +=
-                items.sku_item[0].weight * items.cart.goods_num;
-              this.goodsPrice +=
-                Number(items.sku_item[0].discount_price) * items.cart.goods_num;
-            }
-          });
-        });
-      }
-    },
-    //获取购物车数据
-    getShopCarList() {
-      this.goodsNum = 0;
-      uni.$u.http.get(`/api/cart`).then((res) => {
-        this.goodsList = res.data;
-        //循环店铺，获取购物车商品数量
-        this.goodsList.map((item) => {
-          this.goodsNum += item.goods.length;
-          item.goods.map((items) => {
-            if (items.status == "down") {
-              this.removeProducts++;
-            }
-          });
-        });
-      });
-    },
-  },
-  // mounted() {
-  //   this.getShopCarList();
-  // },
-};
+	export default {
+		data() {
+			return {
+				dele: true,
+				success: true,
+				shopitem: -1,
+				checkboxValue1: [], //商品数组
+				value: 0,
+				all: [], //全选数组
+				goodsList: [],
+				selectall: -1,
+				goodsNum: 0, //购物车商品数量
+				num: false,
+				goodsWeight: 0, //商品重量
+				goodsPrice: 0, //商品价格
+				tabarheight: "",
+				removeProducts: 0, //已下架的商品数量
+				language: "zh-CN",
+			};
+		},
+		watch: {},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+			options2() {
+				var options = [{
+						text: this.i18n.Shiftfocus,
+						style: {
+							backgroundColor: "#FFB115",
+						},
+					},
+					{
+						text: this.i18n.delete,
+						style: {
+							backgroundColor: "#F83224",
+						},
+					},
+				];
+				return options;
+			},
+		},
+		onLoad() {
+			const systemInfo = wx.getSystemInfoSync();
+			const tab =
+				systemInfo.screenHeight -
+				systemInfo.safeArea.bottom +
+				systemInfo.statusBarHeight;
+			this.tabarheight = tab;
+		},
+		onShow() {
+			this.goodsNum = 0; //购物车商品数量
+			this.goodsWeight = 0; //商品重量
+			this.goodsPrice = 0; //商品价格
+			this.checkboxValue1 = [];
+			this.getShopCarList();
+			if (uni.getStorageSync("language") != "") {
+				this.language = uni.getStorageSync("language");
+			}
+		},
+		methods: {
+			//返回顶部
+			backTop() {
+				uni.pageScrollTo({
+					scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
+					duration: 300, // 滚动动画的时长
+				});
+			},
+			//商品下架之后的商品字体颜色
+			getFontColor(status) {
+				if (status == "down") {
+					return "color:rgba(51, 51, 51, .6)";
+				}
+			},
+
+			//关注商品 or 删除商品
+			followOrdelete(e) {
+				//关注商品
+				if (e.index == 0) {
+					this.goodsList.map((item) => {
+						item.goods.map((items) => {
+							if (e.name == items.cart.id) {
+								console.log(items);
+								uni.$u.http
+									.post(`/api/interest/follow`, {
+										interest_type: 0,
+										interest_id: items.merchant_goods.id,
+									})
+									.then((res) => {
+										this.$refs.show.forEach((item) => item.closeHandler(true));
+										console.log(res);
+										uni.showToast({
+											title: "关注成功",
+											icon: "none",
+										});
+									});
+							}
+						});
+					});
+				} else {
+					//删除商品
+					this.goodsList.map((item) => {
+						item.goods.map((items) => {
+							if (e.name == items.cart.id) {
+								uni.$u.http
+									.delete(`/api/cart?ids=${items.cart.id}`)
+									.then((res) => {
+										this.$refs.uToast.show({
+											type: "default",
+											title: this.i18n.defaultTheme,
+											message: this.i18n.successfullydelete,
+										});
+										//删除后关闭滑动打开的单元格
+										this.$refs.show.forEach((item) => item.closeHandler(true));
+										this.getShopCarList();
+									});
+							}
+						});
+					});
+				}
+			},
+
+			//多选删除
+			selectDelete() {
+				let goodsIdList = []; //筛选选中的商品id
+				this.goodsList.map((item) => {
+					item.goods.map((items) => {
+						if (this.checkboxValue1.indexOf(items.cart.id) >= 0) {
+							goodsIdList.push(items.cart.id);
+						}
+					});
+				});
+				uni.$u.http
+					.delete(`/api/cart`, {
+						ids: goodsIdList.join(","),
+					})
+					.then((res) => {
+						this.$refs.uToast.show({
+							type: "default",
+							title: this.i18n.defaultTheme,
+							message: this.i18n.successfullydelete,
+						});
+						this.checkboxValue1 = [];
+						this.getShopCarList();
+					});
+			},
+
+			shop(value) {
+				let num = 0;
+				value.map((item) => {
+					if (this.checkboxValue1.indexOf(item.cart.id) >= 0) {
+						num++;
+					}
+				});
+				return num;
+			},
+
+			//获取排除下架的商品之后的商品数量
+			getNormalGoodsNum(value) {
+				let num = 0;
+				value.map((item) => {
+					if (item.status != "down") {
+						num++;
+					}
+				});
+				return num;
+			},
+
+			//修改购物车商品数量
+			addOrReduce(n) {
+				console.log(n);
+				uni.$u.http
+					.post(`/api/cart/num/${this.num}`, {
+						goods_num: n.value,
+						type: "",
+					})
+					.then((res) => {
+						this.goodsPrice = 0;
+						this.goodsWeight = 0;
+						this.goodsList.map((item) => {
+							item.goods.map((items) => {
+								//判断是否有商品已被选中
+								if (
+									this.checkboxValue1.indexOf(items.cart.id) != -1 &&
+									items.status != "down"
+								) {
+									this.goodsWeight +=
+										items.sku_item[0].weight * items.cart.goods_num;
+									this.goodsPrice +=
+										Number(items.sku_item[0].discount_price) *
+										items.cart.goods_num;
+								}
+							});
+						});
+					});
+			},
+
+			//店铺商品全选
+			shopSelectAll(value) {
+				this.goodsPrice = 0;
+				this.goodsWeight = 0;
+				//先判断存放选中的数组有没有选中的数据
+				if (this.checkboxValue1.length == 0) {
+					//没有数据则直接将选中店铺中的商品存入数组
+					value.map((item) => {
+						//商品下架不得选中
+						if (item.status != "down") {
+							this.checkboxValue1.push(item.cart.id);
+						}
+					});
+				} else {
+					if (
+						this.shop(value) > 0 &&
+						this.shop(value) == this.getNormalGoodsNum(value)
+					) {
+						value.map((item) => {
+							//先判断选中的商品数组中该店铺商品是否已被选中，已被选中则取消选中
+							if (this.checkboxValue1.indexOf(item.cart.id) >= 0) {
+								this.checkboxValue1.splice(
+									this.checkboxValue1.indexOf(item.cart.id),
+									1
+								);
+							}
+						});
+					} else if (
+						(this.shop(value) > 0 &&
+							this.shop(value) != this.getNormalGoodsNum(value)) ||
+						this.shop(value) == 0
+					) {
+						value.map((item) => {
+							//先判断选中的商品数组中该店铺商品是否已被选中，未被选中则推入选中状态，商品下架不得选中
+							if (
+								this.checkboxValue1.indexOf(item.cart.id) == -1 &&
+								item.status != "down"
+							) {
+								this.checkboxValue1.push(item.cart.id);
+							}
+						});
+					}
+				}
+				if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
+					this.$refs.tabbar1.cancelAll();
+				} else {
+					this.$refs.tabbar1.cancelAll(this.i18n.Cancel);
+				}
+
+				//将选中的商品价格相加
+				this.goodsList.map((item) => {
+					item.goods.map((items) => {
+						if (this.checkboxValue1.indexOf(items.cart.id) > -1) {
+							this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
+							this.goodsPrice +=
+								Number(items.sku_item[0].discount_price) * items.cart.goods_num;
+						}
+					});
+				});
+				this.shop(value);
+			},
+			admin() {
+				console.log(this.checkboxValue1);
+				this.success = !this.success;
+			},
+			valChange(e) {
+				console.log("当前值为: " + e.value);
+			},
+			//全选
+			checkAll(e) {
+				console.log("all", e);
+			},
+			//购物车单选
+			checkboxChange(n) {
+				console.log(n);
+				//首先将价格和商品重量重置
+				this.goodsWeight = 0;
+				this.goodsPrice = 0;
+				this.checkboxValue1 = n;
+				this.goodsList.map((item) => {
+					item.goods.map((items) => {
+						if (n.indexOf(items.cart.id) > -1) {
+							this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
+							this.goodsPrice +=
+								Number(items.sku_item[0].discount_price) * items.cart.goods_num;
+						}
+					});
+				});
+				//判断是否全部选中
+				if (
+					this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
+					this.goodsNum != 0
+				) {
+					this.$refs.tabbar1.cancelAll();
+				} else if (
+					this.checkboxValue1.length <
+					this.goodsNum - this.removeProducts
+				) {
+					this.$refs.tabbar1.cancelAll(this.i18n.Cancel);
+				}
+			},
+			//购物车全选
+			allSelect() {
+				const all = this.$refs.tabbar1.cancelAll(this.i18n.selectall);
+				if (
+					this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
+					all.length == 0
+				) {
+					return;
+				}
+				//判断是否已经全选，如已全选，则取消全选
+				if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
+					this.checkboxValue1 = [];
+					this.goodsPrice = 0;
+					this.goodsWeight = 0;
+				} else {
+					this.goodsList.map((item) => {
+						item.goods.map((items) => {
+							//判断是否有商品已被选中
+							if (
+								this.checkboxValue1.indexOf(items.cart.id) == -1 &&
+								items.status != "down"
+							) {
+								this.checkboxValue1.push(items.cart.id);
+								this.goodsWeight +=
+									items.sku_item[0].weight * items.cart.goods_num;
+								this.goodsPrice +=
+									Number(items.sku_item[0].discount_price) * items.cart.goods_num;
+							}
+						});
+					});
+				}
+			},
+			//获取购物车数据
+			getShopCarList() {
+				this.goodsNum = 0;
+				uni.$u.http.get(`/api/cart`).then((res) => {
+					this.goodsList = res.data;
+					//循环店铺，获取购物车商品数量
+					this.goodsList.map((item) => {
+						this.goodsNum += item.goods.length;
+						item.goods.map((items) => {
+							if (items.status == "down") {
+								this.removeProducts++;
+							}
+						});
+					});
+				});
+			},
+		},
+		// mounted() {
+		//   this.getShopCarList();
+		// },
+	};
 </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: 280rpx;
-    right: 20rpx;
-    z-index: 1000;
-
-    .back-icon {
-      width: 32rpx;
-      height: 30rpx;
-    }
-
-    .back-text {
-      font-size: 20rpx;
-      color: #555;
-    }
-  }
-}
-
-.sold {
-  width: 108rpx;
-  height: 36rpx;
-  background: rgba(0, 0, 0, 0.4);
-  border-radius: 18rpx;
-  // padding: 0 14rpx;
-  text-align: center;
-  box-sizing: border-box;
-  line-height: 36rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 20rpx;
-  color: #ffffff;
-  font-style: normal;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin-top: -18rpx;
-  margin-left: -54rpx;
-}
-
-.aaaaaa {
-  float: right;
-}
-.u-row-between {
-  // flex-direction: row-reverse;
-  position: relative;
-}
-
-.delect {
-  // width: 68rpx;
-  height: 44rpx;
-  line-height: 44rpx;
-  border-radius: 22rpx;
-  border: 1rpx solid #ff1515;
-  padding: 0 14rpx;
-  box-sizing: border-box;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 20rpx;
-  color: #ff1515;
-  text-align: center;
-  font-style: normal;
-}
-
-.allweight {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 22rpx;
-  color: #333333;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.sum {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 22rpx;
-  color: #333333;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.summon {
-  font-family: JDZhengHT, JDZhengHT;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #ff1515;
-  line-height: 30rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.settle {
-  width: 176rpx;
-  height: 68rpx;
-  background: #f83224;
-  border-radius: 38rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #ffffff;
-  line-height: 68rpx;
-  text-align: center;
-  font-style: normal;
-  margin-left: 20rpx;
-}
-
-.icon {
-  width: 40rpx;
-  height: 40rpx;
-  background: #f83224;
-  border-radius: 12rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.dle {
-  width: 136rpx;
-  height: 60rpx;
-  border-radius: 38rpx;
-  border: 1rpx solid #979797;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 26rpx;
-  color: #333333;
-  line-height: 60rpx;
-  text-align: center;
-  font-style: normal;
-}
-
-::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;
-}
-
-::v-deep .u-swipe-action-item__right {
-  top: 2rpx !important;
-  right: 2rpx !important;
-  bottom: 2rpx !important;
-}
-
-.bottom {
-  width: 750rpx;
-  height: 100rpx;
-  background: #ffffff;
-  padding: 0 24rpx;
-  box-sizing: border-box;
-}
-
-.num {
-  width: 40rpx;
-  height: 40rpx;
-  border-radius: 20rpx;
-  border: 1rpx solid rgba(151, 151, 151, 0.4);
-  font-family: HarmonyOS_Sans;
-  font-size: 20rpx;
-  color: #222222;
-  line-height: 40rpx;
-  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;
-  position: absolute;
-  right: 10rpx;
-}
-
-.box {
-  padding: 0rpx 24rpx 20rpx;
-  margin-top: 20rpx;
-  box-sizing: border-box;
-
-  .item {
-    padding: 36rpx 20rpx;
-    box-sizing: border-box;
-    width: 702rpx;
-    // height: 556rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-
-    .money {
-      font-family: HarmonyOS_Sans_Medium;
-      font-size: 20rpx;
-      color: #ff1515;
-      line-height: 26rpx;
-      text-align: left;
-      font-style: normal;
-    }
-
-    .weight {
-      font-family: SFPro, SFPro;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #333333;
-      line-height: 24rpx;
-      text-align: left;
-      font-style: normal;
-      margin-left: 12rpx;
-    }
-
-    .goodtab {
-      // width: 96rpx;
-      height: 32rpx;
-      border-radius: 4rpx;
-      border: 1rpx solid #ff1515;
-      padding: 2rpx 8rpx;
-      box-sizing: border-box;
-      text-align: center;
-      line-height: 32rpx;
-      display: inline;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #ff1515;
-      line-height: 28rpx;
-      text-align: left;
-      font-style: normal;
-      margin-right: 6rpx;
-    }
-
-    .goods {
-      // width: 284rpx;
-      height: 40rpx;
-      background: #f4f4f4;
-      border-radius: 8rpx;
-      display: inline;
-      text-align: center;
-      line-height: 40rpx;
-      margin-top: 20rpx;
-      padding: 6rpx 12rpx;
-      box-sizing: border-box;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #555555;
-      line-height: 28rpx;
-      text-align: left;
-      font-style: normal;
-    }
-
-    .goodname {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      word-break: break-all;
-      white-space: nowrap;
-      width: 100%;
-    }
-
-    .shopname {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 26rpx;
-      color: #333333;
-      line-height: 36rpx;
-      text-align: left;
-      font-style: normal;
-
-      .circle {
-        width: 32rpx;
-        height: 32rpx;
-        margin-right: 10rpx;
-      }
-    }
-  }
-}
-
-.shopcart {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 36rpx;
-  color: #222222;
-  line-height: 50rpx;
-  text-align: right;
-  font-style: normal;
-}
-
-.sum {
-  font-family: HarmonyOS_Sans;
-  font-size: 22rpx;
-  color: #333333;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.down {
-  position: absolute;
-  top: 0;
-  left: 0;
-  background-color: #c7c7c7;
-  opacity: 0.7;
-  width: 100%;
-  height: 100%;
-  z-index: 10000;
-  border-radius: 20rpx;
-}
-</style>
+	.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: 280rpx;
+			right: 20rpx;
+			z-index: 1000;
+
+			.back-icon {
+				width: 32rpx;
+				height: 30rpx;
+			}
+
+			.back-text {
+				font-size: 20rpx;
+				color: #555;
+			}
+		}
+	}
+
+	.sold {
+		width: 108rpx;
+		height: 36rpx;
+		background: rgba(0, 0, 0, 0.4);
+		border-radius: 18rpx;
+		// padding: 0 14rpx;
+		text-align: center;
+		box-sizing: border-box;
+		line-height: 36rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #ffffff;
+		font-style: normal;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		margin-top: -18rpx;
+		margin-left: -54rpx;
+	}
+
+	.aaaaaa {
+		float: right;
+	}
+
+	.u-row-between {
+		// flex-direction: row-reverse;
+		position: relative;
+	}
+
+	.delect {
+		// width: 68rpx;
+		height: 44rpx;
+		line-height: 44rpx;
+		border-radius: 22rpx;
+		border: 1rpx solid #ff1515;
+		padding: 0 14rpx;
+		box-sizing: border-box;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #ff1515;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.allweight {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #333333;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.sum {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #333333;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.summon {
+		font-family: JDZhengHT, JDZhengHT;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #ff1515;
+		line-height: 30rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.settle {
+		width: 176rpx;
+		height: 68rpx;
+		background: #f83224;
+		border-radius: 38rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #ffffff;
+		line-height: 68rpx;
+		text-align: center;
+		font-style: normal;
+		margin-left: 20rpx;
+	}
+
+	.icon {
+		width: 40rpx;
+		height: 40rpx;
+		background: #f83224;
+		border-radius: 12rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.dle {
+		width: 136rpx;
+		height: 60rpx;
+		border-radius: 38rpx;
+		border: 1rpx solid #979797;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #333333;
+		line-height: 60rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	::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;
+	}
+
+	::v-deep .u-swipe-action-item__right {
+		top: 2rpx !important;
+		right: 2rpx !important;
+		bottom: 2rpx !important;
+	}
+
+	.bottom {
+		width: 750rpx;
+		height: 100rpx;
+		background: #ffffff;
+		padding: 0 24rpx;
+		box-sizing: border-box;
+	}
+
+	.num {
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 20rpx;
+		border: 1rpx solid rgba(151, 151, 151, 0.4);
+		font-family: HarmonyOS_Sans;
+		font-size: 20rpx;
+		color: #222222;
+		line-height: 40rpx;
+		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;
+		position: absolute;
+		right: 10rpx;
+	}
+
+	.box {
+		padding: 0rpx 24rpx 20rpx;
+		margin-top: 20rpx;
+		box-sizing: border-box;
+
+		.item {
+			padding: 36rpx 20rpx;
+			box-sizing: border-box;
+			width: 702rpx;
+			// height: 556rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 20rpx;
+				color: #ff1515;
+				line-height: 26rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.weight {
+				font-family: SFPro, SFPro;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #333333;
+				line-height: 24rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 12rpx;
+			}
+
+			.goodtab {
+				// width: 96rpx;
+				height: 32rpx;
+				border-radius: 4rpx;
+				border: 1rpx solid #ff1515;
+				padding: 2rpx 8rpx;
+				box-sizing: border-box;
+				text-align: center;
+				line-height: 32rpx;
+				display: inline;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #ff1515;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+				margin-right: 6rpx;
+			}
+
+			.goods {
+				// width: 284rpx;
+				height: 40rpx;
+				background: #f4f4f4;
+				border-radius: 8rpx;
+				display: inline;
+				text-align: center;
+				line-height: 40rpx;
+				margin-top: 20rpx;
+				padding: 6rpx 12rpx;
+				box-sizing: border-box;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #555555;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.goodname {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				word-break: break-all;
+				white-space: nowrap;
+				width: 100%;
+			}
+
+			.shopname {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 26rpx;
+				color: #333333;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+
+				.circle {
+					width: 32rpx;
+					height: 32rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+	}
+
+	.shopcart {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #222222;
+		line-height: 50rpx;
+		text-align: right;
+		font-style: normal;
+	}
+
+	.sum {
+		font-family: HarmonyOS_Sans;
+		font-size: 22rpx;
+		color: #333333;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.down {
+		position: absolute;
+		top: 0;
+		left: 0;
+		background-color: #c7c7c7;
+		opacity: 0.7;
+		width: 100%;
+		height: 100%;
+		z-index: 10000;
+		border-radius: 20rpx;
+	}
+</style>

pages/express/express.vue

@@ -172,10 +172,14 @@
 			<view class="u-flex u-row-between" style="margin-top: 32rpx;">
 				<view class="u-flex">
 					<text class="hai">{{i18n.parceling}}</text>
-					<image v-if="language =='zh-CN'" style="width: 180rpx;height: 32rpx;" src="/static/express/label.png" mode=""></image>
-					<image v-if="language =='en-US'" style="width: 300rpx;height: 32rpx;" src="/static/express/label1.png" mode=""></image>
-					<image v-if="language =='es-ES'" style="width: 334rpx;height: 32rpx;" src="/static/express/label2.png" mode=""></image>
-					<image v-if="language =='it-IT'" style="width: 366rpx;height: 32rpx;" src="/static/express/label3.png" mode=""></image>
+					<image v-if="language =='zh-CN'" style="width: 180rpx;height: 32rpx;"
+						src="/static/express/label.png" mode=""></image>
+					<image v-if="language =='en-US'" style="width: 300rpx;height: 32rpx;"
+						src="/static/express/label1.png" mode=""></image>
+					<image v-if="language =='es-ES'" style="width: 334rpx;height: 32rpx;"
+						src="/static/express/label2.png" mode=""></image>
+					<image v-if="language =='it-IT'" style="width: 366rpx;height: 32rpx;"
+						src="/static/express/label3.png" mode=""></image>
 				</view>
 				<view class="u-flex">
 					<text class="more" @click="more">{{i18n.more}}</text>
@@ -183,7 +187,7 @@
 				</view>
 			</view>
 			<!-- 拼包数据 -->
-			<view class="label" v-for="(item,idx) in expressList" :key="idx">   
+			<view class="label" v-for="(item,idx) in expressList" :key="idx">
 				<view class="" style="display: flex;">
 					<view class="left flexc">
 						<text class="bourn">{{i18n.destination}}</text>
@@ -490,7 +494,8 @@
 			//拼包快递
 			toaccount(info) {
 				uni.navigateTo({
-					url: '/pageB/ParcelExpress?expressinfo=' + encodeURIComponent(JSON.stringify(info))
+					url: '/pageB/ParcelExpress?expressinfo=' + encodeURIComponent(JSON.stringify(info)) +
+						'&type=' + 'pin'
 				})
 			},
 			//物流计算器
@@ -559,7 +564,6 @@
 			recipirnt() {
 				var that = this
 				if (JSON.stringify(that.bottomadd) == '{}') {
-					console.log(11111);
 					uni.navigateTo({
 						url: '/pageB/recipientinfo',
 						events: {
@@ -570,7 +574,6 @@
 						}
 					})
 				} else {
-					console.log(22222222);
 					uni.navigateTo({
 						url: '/pageB/recipientinfo?id=' + that.bottomadd.id,
 						events: {

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

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

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

@@ -1 +1 @@
-.wp-80{width:80%}.wp-47{width:47%}.mg-auto{margin:0 auto}.pd-25{padding:25rpx}.pd-b-20{padding:0 0 20rpx}.pd-tb-40{padding:40rpx 0}.bg-fff{background-color:#fff}.radius5{border-radius:5rpx}.radius50{border-radius:50rpx}.flex-wrap{flex-wrap:wrap}.fss{display:flex;justify-content:flex-start;align-items:flex-start}.fbc{display:flex;justify-content:space-between;align-items:center}.fcc{display:flex;justify-content:center;align-items:center}.safe_area{margin-bottom:constant(safe-area-inset-bottom);margin-bottom:env(safe-area-inset-bottom)}.dra_position{position:absolute;top:0;bottom:0;width:100%;height:auto}.scroll-view-box{font-size:28rpx;bottom:84rpx}.dra_close{box-sizing:border-box;position:absolute;bottom:0;width:100%;padding:15rpx 30rpx 20rpx}.dra_close > view{height:68rpx;line-height:68rpx;text-align:center}.dra_close .btns{color:#a12a30;border:1px solid #a12a30}.dra_close .btns1{color:#fff;background-color:#a12a30}.scroll-view-div > view:nth-child(3n-1){margin:0 10rpx}.scroll-view-div > view{width:32%;height:72rpx;margin-bottom:16rpx;text-align:center;background-color:#f5f5f5}.scroll-view-div .active{color:#ff000b;background-color:#fff4f3}
+.avatar{width:60%;float:left}.avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload:hover{border-color:#409eff}.avatar-uploader-icon{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.avatara{width:178px;height:178px;display:block}.wp-80{width:80%}.wp-47{width:47%}.mg-auto{margin:0 auto}.pd-25{padding:25rpx}.pd-b-20{padding:0 0 20rpx}.pd-tb-40{padding:40rpx 0}.bg-fff{background-color:#fff}.radius5{border-radius:5rpx}.radius50{border-radius:50rpx}.flex-wrap{flex-wrap:wrap}.fss{display:flex;justify-content:flex-start;align-items:flex-start}.fbc{display:flex;justify-content:space-between;align-items:center}.fcc{display:flex;justify-content:center;align-items:center}.safe_area{margin-bottom:constant(safe-area-inset-bottom);margin-bottom:env(safe-area-inset-bottom)}.dra_position{position:absolute;top:0;bottom:0;width:100%;height:auto}.scroll-view-box{font-size:28rpx;bottom:84rpx}.dra_close{box-sizing:border-box;position:absolute;bottom:0;width:100%;padding:15rpx 30rpx 20rpx}.dra_close > view{height:68rpx;line-height:68rpx;text-align:center}.dra_close .btns{color:#a12a30;border:1px solid #a12a30}.dra_close .btns1{color:#fff;background-color:#a12a30}.scroll-view-div > view:nth-child(3n-1){margin:0 10rpx}.scroll-view-div > view{width:32%;height:72rpx;margin-bottom:16rpx;text-align:center;background-color:#f5f5f5}.scroll-view-div .active{color:#ff000b;background-color:#fff4f3}

unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{"120b":function(e,n,r){},"67f8":function(e,n,r){"use strict";r.r(n);var u=r("d77c"),t=r.n(u);for(var f in u)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return u[e]}))}(f);n["default"]=t.a},"6f32":function(e,n,r){"use strict";var u=r("120b"),t=r.n(u);t.a},d77c:function(e,n,r){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=u},e1ce:function(e,n,r){"use strict";r.r(n);var u=r("e418"),t=r("67f8");for(var f in t)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return t[e]}))}(f);r("6f32");var a,c=r("f0c5"),d=Object(c["a"])(t["default"],u["b"],u["c"],!1,null,"3228e8dd",null,!1,u["a"],a);n["default"]=d.exports},e418:function(e,n,r){"use strict";var u;r.d(n,"b",(function(){return t})),r.d(n,"c",(function(){return f})),r.d(n,"a",(function(){return u}));var t=function(){var e=this,n=e.$createElement,r=(e._self._c,e.__map(e.itemInfo.order_goods,(function(n,r){var u=e.__get_orig(n),t=n.refund&&n.refund.actual_refund_price?n.refund.actual_refund_price.split("."):null,f=n.refund&&n.refund.actual_refund_price?n.refund.actual_refund_price.split("."):null,a=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null,c=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null;return{$orig:u,g0:t,g1:f,g2:a,g3:c}})));e.$mp.data=Object.assign({},{$root:{l0:r}})},f=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{"67f8":function(e,n,r){"use strict";r.r(n);var u=r("d77c"),t=r.n(u);for(var f in u)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return u[e]}))}(f);n["default"]=t.a},"7b7d":function(e,n,r){"use strict";var u;r.d(n,"b",(function(){return t})),r.d(n,"c",(function(){return f})),r.d(n,"a",(function(){return u}));var t=function(){var e=this,n=e.$createElement,r=(e._self._c,e.__map(e.itemInfo.order_goods,(function(n,r){var u=e.__get_orig(n),t=n.refund&&n.refund.actual_refund_price?n.refund.actual_refund_price.split("."):null,f=n.refund&&n.refund.actual_refund_price?n.refund.actual_refund_price.split("."):null,a=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null,d=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null;return{$orig:u,g0:t,g1:f,g2:a,g3:d}}))),u=1==e.itemInfo.order_goods[0].refund.status?e.itemInfo.order_goods[0].refund.actual_refund_price&&0!=Number(e.itemInfo.order_goods[0].refund.actual_refund_price):null;e.$mp.data=Object.assign({},{$root:{l0:r,m0:u}})},f=[]},ac3a:function(e,n,r){},d77c:function(e,n,r){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=u},e15a:function(e,n,r){"use strict";var u=r("ac3a"),t=r.n(u);t.a},e1ce:function(e,n,r){"use strict";r.r(n);var u=r("7b7d"),t=r("67f8");for(var f in t)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return t[e]}))}(f);r("e15a");var a,d=r("f0c5"),c=Object(d["a"])(t["default"],u["b"],u["c"],!1,null,"2a5f320a",null,!1,u["a"],a);n["default"]=c.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/refundCard-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/components/goodsInformation.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/goodsInformation"],{2725:function(t,n,o){"use strict";var e=o("d1d7"),u=o.n(e);u.a},"4d5d":function(t,n,o){"use strict";o.r(n);var e=o("b7f1"),u=o("9ad9");for(var i in u)["default"].indexOf(i)<0&&function(t){o.d(n,t,(function(){return u[t]}))}(i);o("2725");var d,r=o("f0c5"),c=Object(r["a"])(u["default"],e["b"],e["c"],!1,null,"2408a3a3",null,!1,e["a"],d);n["default"]=c.exports},"9ad9":function(t,n,o){"use strict";o.r(n);var e=o("b900"),u=o.n(e);for(var i in e)["default"].indexOf(i)<0&&function(t){o.d(n,t,(function(){return e[t]}))}(i);n["default"]=u.a},b7f1:function(t,n,o){"use strict";var e;o.d(n,"b",(function(){return u})),o.d(n,"c",(function(){return i})),o.d(n,"a",(function(){return e}));var u=function(){var t=this,n=t.$createElement,o=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),e="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,u="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,i="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null,d="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null;t.$mp.data=Object.assign({},{$root:{g0:o,g1:e,g2:u,g3:i,g4:d}})},i=[]},b900:function(t,n,o){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},data:function(){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:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"}}};n.default=e},d1d7:function(t,n,o){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/goodsInformation"],{"38b9":function(t,n,o){},"4d5d":function(t,n,o){"use strict";o.r(n);var e=o("6e8e"),u=o("9ad9");for(var i in u)["default"].indexOf(i)<0&&function(t){o.d(n,t,(function(){return u[t]}))}(i);o("50b1");var r,d=o("f0c5"),c=Object(d["a"])(u["default"],e["b"],e["c"],!1,null,"23b6db32",null,!1,e["a"],r);n["default"]=c.exports},"50b1":function(t,n,o){"use strict";var e=o("38b9"),u=o.n(e);u.a},"6e8e":function(t,n,o){"use strict";var e;o.d(n,"b",(function(){return u})),o.d(n,"c",(function(){return i})),o.d(n,"a",(function(){return e}));var u=function(){var t=this,n=t.$createElement,o=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),e="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,u="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,i="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null,r="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null;t.$mp.data=Object.assign({},{$root:{g0:o,g1:e,g2:u,g3:i,g4:r}})},i=[]},"9ad9":function(t,n,o){"use strict";o.r(n);var e=o("b900"),u=o.n(e);for(var i in e)["default"].indexOf(i)<0&&function(t){o.d(n,t,(function(){return e[t]}))}(i);n["default"]=u.a},b900:function(t,n,o){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},data:function(){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:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"}}};n.default=e}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/components/goodsInformation-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/evaluate/evaluate.wxml

@@ -1 +1 @@
-<view class="data-v-795e9d84"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="content data-v-795e9d84"><view class="goods-title data-v-795e9d84"><image class="goods-img data-v-795e9d84" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-795e9d84">{{''+item.goods_name+''}}</view></view><view class="rate data-v-795e9d84"><view class="_label data-v-795e9d84">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+idx}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-795e9d84" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+idx}}" fileList="{{fileList0}}" name="0" multiple="{{true}}" maxCount="{{10}}" accept="all" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-795e9d84" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-795e9d84"><u-icon vue-id="{{('4a6a8fa2-3-'+idx)+','+('4a6a8fa2-2-'+idx)}}" name="camera" size="26" class="data-v-795e9d84" bind:__l="__l"></u-icon><text class="data-v-795e9d84">添加图片/视频</text></view></u-upload><view class="_text data-v-795e9d84"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+idx}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-795e9d84" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-795e9d84" bindtap="__e">提交评价</button></view>
+<view class="data-v-05d99427"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="content data-v-05d99427"><view class="goods-title data-v-05d99427"><image class="goods-img data-v-05d99427" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-05d99427">{{''+item.goods_name+''}}</view></view><view class="rate data-v-05d99427"><view class="_label data-v-05d99427">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+idx}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-05d99427" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+idx}}" accept=" image/*,video/*" fileList="{{fileList0}}" name="0" multiple="{{true}}" maxCount="{{10}}" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-05d99427" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-05d99427"><u-icon vue-id="{{('4a6a8fa2-3-'+idx)+','+('4a6a8fa2-2-'+idx)}}" name="camera" size="26" class="data-v-05d99427" bind:__l="__l"></u-icon><text class="data-v-05d99427">添加图片/视频</text></view></u-upload><view class="_text data-v-05d99427"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+idx}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-05d99427" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-05d99427" bindtap="__e">提交评价</button></view>

unpackage/dist/build/mp-weixin/pageD/evaluate/evaluate.wxss

@@ -1 +1 @@
-.data-v-795e9d84 .u-upload__wrap__preview__image{width:180rpx;height:180rpx}.content.data-v-795e9d84{background-color:#fff;padding:40rpx 24rpx}.content .goods-title.data-v-795e9d84{display:flex;justify-content:flex-start;align-items:center}.content .goods-title .goods-img.data-v-795e9d84{width:52rpx;height:52rpx;border-radius:6rpx}.content .goods-title .title.data-v-795e9d84{font-size:24rpx;color:rgba(51,51,51,.5);margin-left:20rpx}.content .rate.data-v-795e9d84{display:flex;align-items:center;margin-bottom:20rpx}.content .rate ._label.data-v-795e9d84{font-size:32rpx;font-weight:600;margin-right:22rpx}.content ._text.data-v-795e9d84{margin-top:32rpx;padding-top:26rpx;border-top:2rpx solid hsla(0,0%,59.2%,.1)}.content .upload-photo.data-v-795e9d84{width:180rpx;height:180rpx;border:2rpx dashed #979797;border-radius:8rpx;display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:24rpx;color:rgba(34,34,34,.8)}.content.data-v-795e9d84  .u-textarea{background-color:#fff}.btn-1.data-v-795e9d84{background-color:#f83224;color:#fff;border-radius:40rpx;height:80rpx;line-height:80rpx;width:90%;margin:0 auto;margin-top:70rpx;font-size:32rpx}
+.data-v-05d99427 .u-upload__wrap__preview__image{width:180rpx;height:180rpx}.content.data-v-05d99427{background-color:#fff;padding:40rpx 24rpx}.content .goods-title.data-v-05d99427{display:flex;justify-content:flex-start;align-items:center}.content .goods-title .goods-img.data-v-05d99427{width:52rpx;height:52rpx;border-radius:6rpx}.content .goods-title .title.data-v-05d99427{font-size:24rpx;color:rgba(51,51,51,.5);margin-left:20rpx}.content .rate.data-v-05d99427{display:flex;align-items:center;margin-bottom:20rpx}.content .rate ._label.data-v-05d99427{font-size:32rpx;font-weight:600;margin-right:22rpx}.content ._text.data-v-05d99427{margin-top:32rpx;padding-top:26rpx;border-top:2rpx solid hsla(0,0%,59.2%,.1)}.content .upload-photo.data-v-05d99427{width:180rpx;height:180rpx;border:2rpx dashed #979797;border-radius:8rpx;display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:24rpx;color:rgba(34,34,34,.8)}.content.data-v-05d99427  .u-textarea{background-color:#fff}.btn-1.data-v-05d99427{background-color:#f83224;color:#fff;border-radius:40rpx;height:80rpx;line-height:80rpx;width:90%;margin:0 auto;margin-top:70rpx;font-size:32rpx}

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/commodity"],{"0fd8":function(e,t,n){"use strict";n.r(t);var u=n("22ee"),r=n("58e4");for(var f in r)["default"].indexOf(f)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(f);n("6efa");var o,a=n("f0c5"),c=Object(a["a"])(r["default"],u["b"],u["c"],!1,null,"68307348",null,!1,u["a"],o);t["default"]=c.exports},"22ee":function(e,t,n){"use strict";var u;n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return f})),n.d(t,"a",(function(){return u}));var r=function(){var e=this,t=e.$createElement;e._self._c},f=[]},"58e4":function(e,t,n){"use strict";n.r(t);var u=n("694c"),r=n.n(u);for(var f in u)["default"].indexOf(f)<0&&function(e){n.d(t,e,(function(){return u[e]}))}(f);t["default"]=r.a},"694c":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{goodsList:{typeof:Array,default:function(){return[]}},goodsValue:{typeof:Number,default:0}}};t.default=u},"6efa":function(e,t,n){"use strict";var u=n("7f50"),r=n.n(u);r.a},"7f50":function(e,t,n){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/commodity"],{"0fd8":function(t,e,n){"use strict";n.r(e);var u=n("7e37"),r=n("58e4");for(var o in r)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(o);n("dd05");var a,c=n("f0c5"),f=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,"ee3c1ba6",null,!1,u["a"],a);e["default"]=f.exports},"58e4":function(t,e,n){"use strict";n.r(e);var u=n("694c"),r=n.n(u);for(var o in u)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(o);e["default"]=r.a},"694c":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{goodsList:{typeof:Array,default:function(){return[]}},goodsValue:{typeof:Number,default:0}}};e.default=u},"7e37":function(t,e,n){"use strict";var u;n.d(e,"b",(function(){return r})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return u}));var r=function(){var t=this,e=t.$createElement;t._self._c},o=[]},b709:function(t,e,n){},dd05:function(t,e,n){"use strict";var u=n("b709"),r=n.n(u);r.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/newBulitOrder/component/commodity-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.wxml

@@ -1 +1 @@
-<view class="list data-v-68307348"><view class="merchant data-v-68307348"><image class="merchant-img data-v-68307348" src="{{goodsList.image}}" mode="scaleToFill"></image><view class="merchant-name data-v-68307348">{{goodsList.merchant_name}}</view></view><block wx:for="{{goodsList.goods}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="detail data-v-68307348"><image class="detail-img data-v-68307348" src="{{item.sku_item.image}}" mode></image><view class="detail-right data-v-68307348"><view class="data-v-68307348"><text class="toptitle data-v-68307348">{{item.goods_name}}</text><view class="weight data-v-68307348">{{item.sku_item.item+''}}</view></view><view class="u-flex u-row-between data-v-68307348"><view class="money data-v-68307348"><text class="data-v-68307348">¥</text><text style="font-size:34rpx;" class="data-v-68307348">{{item.discount_price}}</text></view><view class="stepping data-v-68307348"><text class="data-v-68307348">x</text><text class="data-v-68307348">{{item.goods_num}}</text></view></view></view></view></block></view>
+<view class="list data-v-ee3c1ba6"><view class="merchant data-v-ee3c1ba6"><image class="merchant-img data-v-ee3c1ba6" src="{{goodsList.image}}" mode="scaleToFill"></image><view class="merchant-name data-v-ee3c1ba6">{{goodsList.merchant_name}}</view></view><block wx:for="{{goodsList.goods}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><block wx:if="{{item.true_stock>item.goods_num}}"><view class="detail data-v-ee3c1ba6"><image class="detail-img data-v-ee3c1ba6" src="{{item.sku_item.image}}" mode></image><view class="detail-right data-v-ee3c1ba6"><view class="data-v-ee3c1ba6"><text class="toptitle data-v-ee3c1ba6">{{item.goods_name}}</text><view class="weight data-v-ee3c1ba6">{{item.sku_item.item+''}}</view></view><view class="u-flex u-row-between data-v-ee3c1ba6"><view class="money data-v-ee3c1ba6"><text class="data-v-ee3c1ba6">¥</text><text style="font-size:34rpx;" class="data-v-ee3c1ba6">{{item.discount_price}}</text></view><view class="stepping data-v-ee3c1ba6"><text class="data-v-ee3c1ba6">x</text><text class="data-v-ee3c1ba6">{{item.goods_num}}</text></view></view></view></view></block></block></view>

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.wxss

@@ -1 +1 @@
-.list.data-v-68307348{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:28rpx 26rpx 36rpx 24rpx}.list .merchant.data-v-68307348{display:flex;justify-content:flex-start}.list .merchant .merchant-img.data-v-68307348{width:38rpx;height:38rpx;margin-right:16rpx}.list .merchant .merchant-name.data-v-68307348{font-size:30rpx;color:#222}.list .detail.data-v-68307348{margin-top:32rpx;display:flex}.list .detail .detail-img.data-v-68307348{width:184rpx;height:184rpx;margin-right:24rpx}.list .detail .detail-right.data-v-68307348{flex-direction:column;justify-content:space-between;height:184rpx;display:flex;flex:1}.list .detail .detail-right .toptitle.data-v-68307348{font-family:PingFangSC,PingFang SC;font-size:28rpx;color:#222;width:100%;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:1;display:-webkit-box;-webkit-box-orient:vertical;word-break:break-all;margin-bottom:16rpx}.list .detail .detail-right .weight.data-v-68307348{font-family:PingFangSC,PingFang SC;font-size:24rpx;color:rgba(34,34,34,.6);line-height:34rpx}.list .detail .detail-right .money.data-v-68307348{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.list .detail .detail-right .stepping.data-v-68307348{display:flex;width:50rpx;height:40rpx;justify-content:space-around;align-items:center;font-size:30rpx;border-radius:20rpx}
+.list.data-v-ee3c1ba6{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:28rpx 26rpx 36rpx 24rpx}.list .merchant.data-v-ee3c1ba6{display:flex;justify-content:flex-start}.list .merchant .merchant-img.data-v-ee3c1ba6{width:38rpx;height:38rpx;margin-right:16rpx}.list .merchant .merchant-name.data-v-ee3c1ba6{font-size:30rpx;color:#222}.list .detail.data-v-ee3c1ba6{margin-top:32rpx;display:flex}.list .detail .detail-img.data-v-ee3c1ba6{width:184rpx;height:184rpx;margin-right:24rpx}.list .detail .detail-right.data-v-ee3c1ba6{flex-direction:column;justify-content:space-between;height:184rpx;display:flex;flex:1}.list .detail .detail-right .toptitle.data-v-ee3c1ba6{font-family:PingFangSC,PingFang SC;font-size:28rpx;color:#222;width:100%;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:1;display:-webkit-box;-webkit-box-orient:vertical;word-break:break-all;margin-bottom:16rpx}.list .detail .detail-right .weight.data-v-ee3c1ba6{font-family:PingFangSC,PingFang SC;font-size:24rpx;color:rgba(34,34,34,.6);line-height:34rpx}.list .detail .detail-right .money.data-v-ee3c1ba6{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.list .detail .detail-right .stepping.data-v-ee3c1ba6{display:flex;width:50rpx;height:40rpx;justify-content:space-around;align-items:center;font-size:30rpx;border-radius:20rpx}

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/goodsInformation.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/goodsInformation"],{"0664":function(t,n,e){"use strict";e.r(n);var o=e("89b5"),u=e("a76f");for(var f in u)["default"].indexOf(f)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(f);e("9f4c");var r,a=e("f0c5"),i=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,"08b50366",null,!1,o["a"],r);n["default"]=i.exports},"67aa":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{goodinfo:{typeof:Object,default:function(){return{}}},sku_info:{typeof:Object,default:function(){return{}}},containname:{typeof:String,default:""},goodsPrice:{typeof:String,default:""},countGoodsInformation:{typeof:Object,default:function(){return{}}},goodsValue:{typeof:Number,default:0},goodsWeight:{typeof:Number,default:0},specificationsPrice:{typeof:Number,default:0}},computed:{i18n:function(){return this.$t("index")}}};n.default=o},"89b5":function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return f})),e.d(n,"a",(function(){return o}));var u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.containname?Number(Number(t.countGoodsInformation.unit_price)*t.goodsWeight).toFixed(2):null);t.$mp.data=Object.assign({},{$root:{g0:e}})},f=[]},"9f4c":function(t,n,e){"use strict";var o=e("b4bf"),u=e.n(o);u.a},a76f:function(t,n,e){"use strict";e.r(n);var o=e("67aa"),u=e.n(o);for(var f in o)["default"].indexOf(f)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(f);n["default"]=u.a},b4bf:function(t,n,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/goodsInformation"],{"0664":function(t,n,e){"use strict";e.r(n);var o=e("b30c"),u=e("a76f");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("a5b7");var f,r=e("f0c5"),i=Object(r["a"])(u["default"],o["b"],o["c"],!1,null,"0e4843a6",null,!1,o["a"],f);n["default"]=i.exports},"67aa":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{goodinfo:{typeof:Object,default:function(){return{}}},sku_info:{typeof:Object,default:function(){return{}}},containname:{typeof:String,default:""},goodsPrice:{typeof:String,default:""},countGoodsInformation:{typeof:Object,default:function(){return{}}},goodsValue:{typeof:Number,default:0},goodsWeight:{typeof:Number,default:0},specificationsPrice:{typeof:Number,default:0}},computed:{i18n:function(){return this.$t("index")}}};n.default=o},a5b7:function(t,n,e){"use strict";var o=e("dc9b"),u=e.n(o);u.a},a76f:function(t,n,e){"use strict";e.r(n);var o=e("67aa"),u=e.n(o);for(var a in o)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=u.a},b30c:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.containname?Number(t.countGoodsInformation.sum).toFixed(2):null);t.$mp.data=Object.assign({},{$root:{g0:e}})},a=[]},dc9b:function(t,n,e){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/newBulitOrder/component/goodsInformation-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/goodsInformation.wxml

@@ -1 +1 @@
-<view class="list data-v-08b50366"><view class="abount data-v-08b50366" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-08b50366" style="margin-bottom:40rpx;"><view class="name data-v-08b50366">{{i18n.Commodityamount}}</view><view class="money data-v-08b50366">{{'¥'+specificationsPrice+''}}</view></view><block wx:if="{{containname}}"><view class="u-flex u-row-between data-v-08b50366"><view class="name data-v-08b50366">{{i18n.Grosscommodityweight}}</view><view class="money data-v-08b50366">{{goodsWeight+"kg"}}</view></view></block><block wx:if="{{containname}}"><view class="back u-flex data-v-08b50366"><image style="width:32rpx;height:32rpx;" src="../../../static/images/warning.png" mode class="data-v-08b50366"></image><text style="margin-left:12rpx;font-size:24rpx;" class="data-v-08b50366">{{i18n.buy+countGoodsInformation.max_weight+"kg"+i18n.price+"¥"+countGoodsInformation.unit_fee+"，"+i18n.morefavorable}}</text></view></block><view class="u-flex u-row-between data-v-08b50366" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-08b50366">{{i18n.Costperkilogram}}</view><view class="money data-v-08b50366">{{containname?countGoodsInformation.unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-08b50366"><view class="name data-v-08b50366">{{i18n.freight}}</view><view class="money data-v-08b50366">{{containname?$root.g0:i18n.shippingmethod}}</view></view><block wx:if="{{false}}"><view class="zong u-flex u-row-right data-v-08b50366"><view class="data-v-08b50366"><text class="small data-v-08b50366">{{i18n.subtotal}}</text><text class="mon data-v-08b50366">¥</text><text class="mon data-v-08b50366" style="font-size:40rpx;">{{specificationsPrice}}</text></view></view></block></view></view>
+<view class="list data-v-0e4843a6"><view class="abount data-v-0e4843a6" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-0e4843a6" style="margin-bottom:40rpx;"><view class="name data-v-0e4843a6">{{i18n.Commodityamount}}</view><view class="money data-v-0e4843a6">{{'¥'+specificationsPrice+''}}</view></view><block wx:if="{{containname}}"><view class="u-flex u-row-between data-v-0e4843a6"><view class="name data-v-0e4843a6">{{i18n.Grosscommodityweight}}</view><view class="money data-v-0e4843a6">{{goodsWeight+"kg"}}</view></view></block><block wx:if="{{containname}}"><view class="back u-flex data-v-0e4843a6"><image style="width:32rpx;height:32rpx;" src="../../../static/images/warning.png" mode class="data-v-0e4843a6"></image><text style="margin-left:12rpx;font-size:24rpx;" class="data-v-0e4843a6">{{i18n.buy+countGoodsInformation.max_weight+"kg"+i18n.price+"¥"+countGoodsInformation.unit_fee+"，"+i18n.morefavorable}}</text></view></block><view class="u-flex u-row-between data-v-0e4843a6" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-0e4843a6">{{i18n.Costperkilogram}}</view><view class="money data-v-0e4843a6">{{containname?countGoodsInformation.unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-0e4843a6"><view class="name data-v-0e4843a6">{{i18n.freight}}</view><view class="money data-v-0e4843a6">{{containname?$root.g0:i18n.shippingmethod}}</view></view><block wx:if="{{false}}"><view class="zong u-flex u-row-right data-v-0e4843a6"><view class="data-v-0e4843a6"><text class="small data-v-0e4843a6">{{i18n.subtotal}}</text><text class="mon data-v-0e4843a6">¥</text><text class="mon data-v-0e4843a6" style="font-size:40rpx;">{{specificationsPrice}}</text></view></view></block></view></view>

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/goodsInformation.wxss

@@ -1 +1 @@
-.list .abount.data-v-08b50366{padding:28rpx 24rpx;box-sizing:border-box;background:#fff;border-radius:16rpx;width:702rpx}.list .abount .zong.data-v-08b50366{width:654rpx;padding:22rpx 0 0 0;border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:32rpx}.list .abount .zong .small.data-v-08b50366{font-family:PingFangTC;font-weight:400;font-size:24rpx;color:#444;line-height:34rpx;text-align:left;font-style:normal}.list .abount .zong .mon.data-v-08b50366{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;margin-left:12rpx;font-weight:700}.list .abount .back.data-v-08b50366{background:#f4f4f4;padding:22rpx 16rpx;box-sizing:border-box;margin-top:10rpx}.list .abount .name.data-v-08b50366{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#333;line-height:40rpx;text-align:left;font-style:normal}.list .abount .money.data-v-08b50366{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#222;line-height:38rpx;text-align:left;font-style:normal;font-weight:600}
+.list .abount.data-v-0e4843a6{padding:28rpx 24rpx;box-sizing:border-box;background:#fff;border-radius:16rpx;width:702rpx}.list .abount .zong.data-v-0e4843a6{width:654rpx;padding:22rpx 0 0 0;border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:32rpx}.list .abount .zong .small.data-v-0e4843a6{font-family:PingFangTC;font-weight:400;font-size:24rpx;color:#444;line-height:34rpx;text-align:left;font-style:normal}.list .abount .zong .mon.data-v-0e4843a6{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;margin-left:12rpx;font-weight:700}.list .abount .back.data-v-0e4843a6{background:#f4f4f4;padding:22rpx 16rpx;box-sizing:border-box;margin-top:10rpx}.list .abount .name.data-v-0e4843a6{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#333;line-height:40rpx;text-align:left;font-style:normal}.list .abount .money.data-v-0e4843a6{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#222;line-height:38rpx;text-align:left;font-style:normal;font-weight:600}

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/nextLogistics.wxss

@@ -1 +1 @@
-.poptitle.data-v-1c97f771{width:142rpx;height:50rpx;font-family:PingFangSC,PingFang SC;font-weight:600;font-size:36rpx;color:#333;text-align:center;width:100%}.transport.data-v-1c97f771{width:702rpx;height:164rpx;background:#fff;border-radius:12rpx;padding:24rpx 20rpx;box-sizing:border-box}.yundate.data-v-1c97f771{font-family:PingFangSC,PingFang SC;font-weight:550;font-size:32rpx;color:#333;line-height:44rpx;text-align:left;font-style:normal}.chest.data-v-1c97f771{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal}.mone.data-v-1c97f771{font-family:JDZhengHT;font-weight:400;font-size:26rpx;color:#f83224;line-height:32rpx;text-align:left;font-style:normal}.enbottom.data-v-1c97f771{width:750rpx;height:166rpx;background:#fff;position:absolute;left:0rpx;bottom:0;padding:0 24rpx;box-sizing:border-box}.enbottom .confirm.data-v-1c97f771{width:398rpx;height:84rpx;background:#f83224;border-radius:42rpx;text-align:center;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.enbottom .cancel.data-v-1c97f771{width:280rpx;height:84rpx;border-radius:42rpx;border:2rpx solid hsla(0,0%,59.2%,.3);font-family:PingFangSC,PingFang SC;font-weight:400;font-size:32rpx;color:#444;line-height:84rpx;text-align:center;font-style:normal}
+.poptitle.data-v-0826880e{width:142rpx;height:50rpx;font-family:PingFangSC,PingFang SC;font-weight:600;font-size:36rpx;color:#333;text-align:center;width:100%}.transport.data-v-0826880e{width:702rpx;height:164rpx;background:#fff;border-radius:12rpx;padding:24rpx 20rpx;box-sizing:border-box}.yundate.data-v-0826880e{font-family:PingFangSC,PingFang SC;font-weight:550;font-size:32rpx;color:#333;line-height:44rpx;text-align:left;font-style:normal}.chest.data-v-0826880e{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal}.mone.data-v-0826880e{font-family:JDZhengHT;font-weight:400;font-size:26rpx;color:#f83224;line-height:32rpx;text-align:left;font-style:normal}.enbottom.data-v-0826880e{width:750rpx;height:166rpx;background:#fff;position:absolute;left:0rpx;bottom:0;padding:0 24rpx;box-sizing:border-box}.enbottom .confirm.data-v-0826880e{width:398rpx;height:84rpx;background:#f83224;border-radius:42rpx;text-align:center;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.enbottom .cancel.data-v-0826880e{width:280rpx;height:84rpx;border-radius:42rpx;border:2rpx solid hsla(0,0%,59.2%,.3);font-family:PingFangSC,PingFang SC;font-weight:400;font-size:32rpx;color:#444;line-height:84rpx;text-align:center;font-style:normal}

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/newBulitOrder.wxss

@@ -1 +1 @@
-.page.data-v-279df021{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box;padding-bottom:200rpx}.page .address.data-v-279df021{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-279df021{font-family:SFPro;font-weight:500;font-size:32rpx;color:#222;line-height:36rpx;text-align:left;font-style:normal}.page .address .info.data-v-279df021{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal;margin-top:20rpx}.page .logistics.data-v-279df021{width:702rpx;background:#fff;border-radius:16rpx;padding:28rpx 22rpx;box-sizing:border-box;margin-top:20rpx}.page .logistics .change.data-v-279df021{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#f83224;line-height:40rpx;text-align:left;font-style:normal;margin-right:8rpx}.page .btn.data-v-279df021{width:750rpx;height:166rpx;background:#fff;box-shadow:0rpx -1rpx 0rpx 0rpx rgba(0,0,0,.05);position:fixed;bottom:0;left:0;padding:0 24rpx 5rpx 5rpx;box-sizing:border-box}.page .btn .money.data-v-279df021{font-family:HarmonyOS_Sans_Medium;font-size:48rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.page .btn .kg.data-v-279df021{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#333;line-height:34rpx;text-align:left;font-style:normal}.page .btn .order.data-v-279df021{width:232rpx;height:80rpx;background:#f83224;border-radius:40rpx;font-family:PingFangTC;font-weight:500;font-size:32rpx;color:#fff;line-height:80rpx;text-align:center;font-style:normal;margin-left:20rpx}
+.page.data-v-56e14280{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box;padding-bottom:200rpx}.page .address.data-v-56e14280{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-56e14280{font-family:SFPro;font-weight:500;font-size:32rpx;color:#222;line-height:36rpx;text-align:left;font-style:normal}.page .address .info.data-v-56e14280{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal;margin-top:20rpx}.page .logistics.data-v-56e14280{width:702rpx;background:#fff;border-radius:16rpx;padding:28rpx 22rpx;box-sizing:border-box;margin-top:20rpx}.page .logistics .change.data-v-56e14280{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#f83224;line-height:40rpx;text-align:left;font-style:normal;margin-right:8rpx}.page .btn.data-v-56e14280{width:750rpx;height:166rpx;background:#fff;box-shadow:0rpx -1rpx 0rpx 0rpx rgba(0,0,0,.05);position:fixed;bottom:0;left:0;padding:0 24rpx 5rpx 5rpx;box-sizing:border-box}.page .btn .money.data-v-56e14280{font-family:HarmonyOS_Sans_Medium;font-size:48rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.page .btn .kg.data-v-56e14280{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#333;line-height:34rpx;text-align:left;font-style:normal}.page .btn .order.data-v-56e14280{width:232rpx;height:80rpx;background:#f83224;border-radius:40rpx;font-family:PingFangTC;font-weight:500;font-size:32rpx;color:#fff;line-height:80rpx;text-align:center;font-style:normal;margin-left:20rpx}

unpackage/dist/build/mp-weixin/pageD/productDetails/productDetails.wxss

@@ -1 +1 @@
-.page.data-v-5b1171ac{padding-bottom:150rpx;margin-top:174rpx}.page .u-top.data-v-5b1171ac{display:flex;width:200rpx;justify-content:space-between}.page .u-top .goods-Detail.data-v-5b1171ac{color:#f83224}.page .top-fail.data-v-5b1171ac{height:60rpx;background-color:#fff1ee;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .top-fail .fail-icon.data-v-5b1171ac{width:32rpx;height:32rpx;margin-right:10rpx}.page .fail.data-v-5b1171ac{height:60rpx;background-color:#fff1d7;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .fail .fail-icon.data-v-5b1171ac{width:32rpx;height:32rpx;margin-right:10rpx}.page .goods-img.data-v-5b1171ac{width:100%;height:750rpx}.page .title-price.data-v-5b1171ac{background-color:#fff;width:96%;margin:0 auto;border-radius:16rpx;padding-bottom:36rpx;margin-top:20rpx;padding-top:10rpx}.page .price.data-v-5b1171ac{color:#f83224;margin-top:6rpx;padding-left:40rpx;font-weight:600}.page .goods-title.data-v-5b1171ac{padding:0 40rpx;font-size:32rpx;margin-top:20rpx}.page .goods-detail.data-v-5b1171ac{font-size:28rpx;padding-left:40rpx;background-color:#fff;width:90%;margin:0 auto;margin-top:40rpx;border-radius:16rpx 16rpx 0 0;padding-top:30rpx}.page .detail.data-v-5b1171ac{padding:24rpx 20rpx;background-color:#fff;width:90%;margin:0 auto;border-radius:0 0 16rpx 16rpx}.page .detail .detail-img.data-v-5b1171ac{width:100%}.page .footer.data-v-5b1171ac{position:fixed;bottom:0;width:100%;padding-bottom:84rpx;padding-top:20rpx;background-color:#fff}.page .footer .btn.data-v-5b1171ac{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx;margin:0 auto}
+.page.data-v-2e0848cd{padding-bottom:150rpx;margin-top:174rpx}.page .u-top.data-v-2e0848cd{display:flex;width:200rpx;justify-content:space-between}.page .u-top .goods-Detail.data-v-2e0848cd{color:#f83224}.page .top-fail.data-v-2e0848cd{height:60rpx;background-color:#fff1ee;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .top-fail .fail-icon.data-v-2e0848cd{width:32rpx;height:32rpx;margin-right:10rpx}.page .fail.data-v-2e0848cd{height:60rpx;background-color:#fff1d7;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .fail .fail-icon.data-v-2e0848cd{width:32rpx;height:32rpx;margin-right:10rpx}.page .goods-img.data-v-2e0848cd{width:100%;height:750rpx}.page .title-price.data-v-2e0848cd{background-color:#fff;width:96%;margin:0 auto;border-radius:16rpx;padding-bottom:36rpx;margin-top:20rpx;padding-top:10rpx}.page .price.data-v-2e0848cd{color:#f83224;margin-top:6rpx;padding-left:40rpx;font-weight:600}.page .goods-title.data-v-2e0848cd{padding:0 40rpx;font-size:32rpx;margin-top:20rpx}.page .goods-detail.data-v-2e0848cd{font-size:28rpx;padding-left:40rpx;background-color:#fff;width:90%;margin:0 auto;margin-top:40rpx;border-radius:16rpx 16rpx 0 0;padding-top:30rpx}.page .detail.data-v-2e0848cd{padding:24rpx 20rpx;background-color:#fff;width:90%;margin:0 auto;border-radius:0 0 16rpx 16rpx}.page .detail .detail-img.data-v-2e0848cd{width:100%}.page .footer.data-v-2e0848cd{position:fixed;bottom:0;width:100%;padding-bottom:84rpx;padding-top:20rpx;background-color:#fff}.page .footer .btn.data-v-2e0848cd{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx;margin:0 auto}

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

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

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

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

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

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

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

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

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

@@ -8,7 +8,7 @@
     "urlCheck": false,
     "es6": false,
     "postcss": false,
-    "minified": false,
+    "minified": true,
     "newFeature": true,
     "bigPackageSizeSupport": true,
     "babelSetting": {

unpackage/dist/dev/mp-weixin/pageA/rule/rule.wxss

@@ -24,6 +24,33 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.avatar {
+  width: 60%;
+  float: left;
+}
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatara {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
 .wp-80 {
   width: 80%;
 }

unpackage/dist/dev/mp-weixin/pageB/Senderinfor.wxml

@@ -1 +1 @@
-<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex"><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex"><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex"><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>
+<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex "><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex "><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex "><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>