From d577f9815099a291ef018522ef6e50ebc9b3ee42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Tue, 28 Oct 2025 20:35:39 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/shop/you-item.vue                  |    2 +-
 manifest.json                                 |    2 +-
 .../order_submit/order_submit.vue             | 2302 +++++++++--------
 .../other_package/productInfo/productInfo.vue |    4 +-
 static/shopping/tp.png                        |  Bin 0 -> 5891 bytes
 utils/config.js                               |    4 +-
 6 files changed, 1254 insertions(+), 1060 deletions(-)
 create mode 100644 static/shopping/tp.png

diff --git a/components/shop/you-item.vue b/components/shop/you-item.vue
index f2676a2..e0ef2be 100644
--- a/components/shop/you-item.vue
+++ b/components/shop/you-item.vue
@@ -5,7 +5,7 @@
 		</view>
 		<view class="shop-right-view">
 			<view class="right-top-view text-overflow1">
-				<text class="text-32 text-bold text-zu text-overflow1">{{obj.title}}</text> 
+				<image v-if="obj.id === 33162" src="/static/shopping/tp.png" alt="" style="width: 80rpx;height: 32rpx; margin-top: 4rpx; margin-left: 4rpx;"></image><text class="text-32 text-bold text-zu text-overflow1">{{obj.title}}</text> 
 			</view>
 			<view class="right-bottom-view">
 				<view class="flex-c-lr" >
diff --git a/manifest.json b/manifest.json
index e342669..3b58806 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__4910728",
     "description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城；通过“有趣”“有利”“有希望”的卖货玩法，吸引消费者、推广者、商家、投资人参与生态，共同打造共创共享的全球产业生态。",
     "versionName" : "1.0.1",
-    "versionCode" : 135,
+    "versionCode" : 136,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/order_package/order_submit/order_submit.vue b/pages/order_package/order_submit/order_submit.vue
index 78ed8d4..abcb022 100644
--- a/pages/order_package/order_submit/order_submit.vue
+++ b/pages/order_package/order_submit/order_submit.vue
@@ -1,1135 +1,1329 @@
 <template>
-	<view class="order_submit_warp">
-		<Header :leftTitle="$t('order.submit.title')" leftPathType="switchTab"
-			leftPath="/pages/shopping_cart/shopping_cart" />
-		<!-- 收件人信息 -->
-		<view class="order_submit_header_warp" @click="checkAddressShow(true, 'data')"
-			v-if="orderInfo.address && Object.keys(orderInfo.address).length !== 0">
-			<view class="header_areaAddress_warp">
-				<view class="tab-comm areaAddress_default" v-if="orderInfo.address.isDefault">默认</view>
-				<!-- <view class="tab-comm areaAddress_tab">家</view> -->
-				<text>{{ assembleAddress(orderInfo.address).names }}</text>
-			</view>
-			<view class="header_detailedAddress_warp">
-				<view style="width: 90%;">{{ orderInfo.address.address }}</view>
-				<up-image src="/static/common/right.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
-			</view>
-			<view class="header_name_warp">
-				<text style="margin-right: 20rpx;">{{ orderInfo.address.name }}</text>
-				<text>{{ orderInfo.address.phone }}</text>
-			</view>
-		</view>
-		<!-- 没有地址 -->
-		<view v-else class="no_address" @click="checkAddressShow(true, 'data')">
-			<view class="no_address_title">
-				<view>请填写地址</view>
-				<view style="margin-top: 10rpx;">
-					<up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
-				</view>
-			</view>
-			<view class="no_address_msg">您还未添加收货地址，请完善地址！</view>
-		</view>
-		<!-- 店铺信息 -->
-		<view class="order_store_warp order_product_warp" v-for="(item, index) in orderInfo.shops" :key="item.id">
-			<!-- 头部 -->
-			<view class="order_product_header">
-				<up-image :src="item.logo" width="22" height="22" bgColor="#f1f6ff00" shape="circle"></up-image>
-				<view class="order_product_title">{{ item.name }}</view>
-			</view>
-			<view v-for="(addItem, addIndex) in item.addrTimes" :key="addIndex">
-				<!-- 单个地址 -->
-				<view v-if="addItem.address" class="shops_address_warp"
-					@click="checkAddressShow(true, 'addrTimes', addIndex, index)">
-					<view class="shops_address_warp_title">
-						<text style="margin-right: 20rpx;">{{ addItem.address.name }}</text>
-						<text>{{ addItem.address.address }}</text>
-					</view>
-					<view>
-						<up-image src="/static/common/right.png" width="16" height="16" bgColor="#f1f6ff00"></up-image>
-					</view>
-				</view>
-				<!-- 产品详情 -->
-				<view v-if="ids" class="order_item_content" v-for="(pItem, pIndex) in addItem.goods" :key="pItem.id">
-					<up-image :src="pItem.img" width="80" height="80" bgColor="#f1f6ff00"
-						@click="jumpProductInfo(pItem)"></up-image>
-					<view class="content_info_right">
-						<view class="content_info_left_total" @click="jumpProductInfo(pItem)">
-							<view class="content_info_title">{{ pItem.title }}</view>
-							<view class="content_info_tag">{{ pItem.specs }}</view>
-						</view>
-						<view class="content_info_right_total">
-							<view class="content_right_total">
-								<view>￥<text style="font-size: 36rpx;">{{ pItem.totalPrice }}</text></view>
-								<view>每件到手价￥{{ pItem.unitPrice }}</view>
-							</view>
-							<view class="shopping_info_quantity">
-								<view class="quantity_but" @click="quantityFun('minus', index, addIndex, pIndex)">-</view>
-								<view class="quantity_value">{{ pItem.num }}</view>
-								<view class="quantity_but" @click="quantityFun('add', index, addIndex, pIndex)">+</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view v-else class="order_item_content" v-for="(pItem, pIndex) in addItem.goods" :key="pItem.id">
-					<up-image :src="pItem.img" width="80" height="80" bgColor="#f1f6ff00"
-						@click="jumpProductInfo(pItem)"></up-image>
-					<view class="content_info_right">
-						<view class="content_info_left_total" @click="jumpProductInfo(pItem)">
-							<view class="content_info_title">{{ pItem.title }}</view>
-							<view class="content_info_tag">{{ pItem.specs }}</view>
-						</view>
-						<view class="content_info_right_total">
-							<view class="content_right_total">
-								<view>￥<text style="font-size: 36rpx;">{{ pItem.totalPrice }}</text></view>
-								<view>每件到手价￥{{ pItem.unitPrice }}</view>
-							</view>
-							<view class="shopping_info_quantity">
-								<view class="quantity_but" @click="quantityFun('minus', index, addIndex, pIndex)">-</view>
-								<view class="quantity_value">{{ pItem.num }}</view>
-								<view class="quantity_but" @click="quantityFun('add', index, addIndex, pIndex)">+</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="content_info_right_remark">
-					<view class="title">留言</view>
-					<up-input placeholder="建议留言前先与商家沟通确认" border="surround" v-model="addItem.remark" :customStyle="{
-						'text-align': 'right !important',
-						'border': '0rpx',
-					}" style="text-align: right;"></up-input>
-				</view>
-				<!-- 运费 -->
-				<view class="order_freight_warp" v-if="orderInfo">
-					<view class="order_freight_item">
-						<view>运费<text style="color: #C0C3C6;margin-left:20rpx">{{ getValue(PRODUCT_DELIVERY_TIME, addItem.deliveryTime) }}</text></view>
-						<view class="value_" >
-							{{orderInfo.postage ? '￥' + orderInfo.postage : '包邮'}}
-						</view>
-					</view>
-					<!-- <view class="order_freight_item">
+  <view class="order_submit_warp">
+    <Header
+      :leftTitle="$t('order.submit.title')"
+      leftPathType="switchTab"
+      leftPath="/pages/shopping_cart/shopping_cart"
+    />
+    <!-- 收件人信息 -->
+    <view
+      class="order_submit_header_warp"
+      @click="checkAddressShow(true, 'data')"
+      v-if="orderInfo.address && Object.keys(orderInfo.address).length !== 0"
+    >
+      <view class="header_areaAddress_warp">
+        <view
+          class="tab-comm areaAddress_default"
+          v-if="orderInfo.address.isDefault"
+          >默认</view
+        >
+        <!-- <view class="tab-comm areaAddress_tab">家</view> -->
+        <text>{{ assembleAddress(orderInfo.address).names }}</text>
+      </view>
+      <view class="header_detailedAddress_warp">
+        <view style="width: 90%">{{ orderInfo.address.address }}</view>
+        <up-image
+          src="/static/common/right.png"
+          width="20"
+          height="20"
+          bgColor="#f1f6ff00"
+        ></up-image>
+      </view>
+      <view class="header_name_warp">
+        <text style="margin-right: 20rpx">{{ orderInfo.address.name }}</text>
+        <text>{{ orderInfo.address.phone }}</text>
+      </view>
+    </view>
+    <!-- 没有地址 -->
+    <view v-else class="no_address" @click="checkAddressShow(true, 'data')">
+      <view class="no_address_title">
+        <view>请填写地址</view>
+        <view style="margin-top: 10rpx">
+          <up-image
+            src="/static/common/right.png"
+            width="14"
+            height="14"
+            bgColor="#f1f6ff00"
+          ></up-image>
+        </view>
+      </view>
+      <view class="no_address_msg">您还未添加收货地址，请完善地址！</view>
+    </view>
+    <!-- 店铺信息 -->
+    <view
+      class="order_store_warp order_product_warp"
+      v-for="(item, index) in orderInfo.shops"
+      :key="item.id"
+    >
+      <!-- 头部 -->
+      <view class="order_product_header">
+        <up-image
+          :src="item.logo"
+          width="22"
+          height="22"
+          bgColor="#f1f6ff00"
+          shape="circle"
+        ></up-image>
+        <view class="order_product_title">{{ item.name }}</view>
+      </view>
+      <view v-for="(addItem, addIndex) in item.addrTimes" :key="addIndex">
+        <!-- 单个地址 -->
+        <view
+          v-if="addItem.address"
+          class="shops_address_warp"
+          @click="checkAddressShow(true, 'addrTimes', addIndex, index)"
+        >
+          <view class="shops_address_warp_title">
+            <text style="margin-right: 20rpx">{{ addItem.address.name }}</text>
+            <text>{{ addItem.address.address }}</text>
+          </view>
+          <view>
+            <up-image
+              src="/static/common/right.png"
+              width="16"
+              height="16"
+              bgColor="#f1f6ff00"
+            ></up-image>
+          </view>
+        </view>
+        <!-- 产品详情 -->
+        <view
+          v-if="ids"
+          class="order_item_content"
+          v-for="(pItem, pIndex) in addItem.goods"
+          :key="pItem.id"
+        >
+          <up-image
+            :src="pItem.img"
+            width="80"
+            height="80"
+            bgColor="#f1f6ff00"
+            @click="jumpProductInfo(pItem)"
+          ></up-image>
+          <view class="content_info_right">
+            <view
+              class="content_info_left_total"
+              @click="jumpProductInfo(pItem)"
+            >
+              <view class="content_info_title">{{ pItem.title }}</view>
+              <view class="content_info_tag">{{ pItem.specs }}</view>
+            </view>
+            <view class="content_info_right_total">
+              <view class="content_right_total">
+                <view
+                  >￥<text style="font-size: 36rpx">{{
+                    pItem.totalPrice
+                  }}</text></view
+                >
+                <view>每件到手价￥{{ pItem.unitPrice }}</view>
+              </view>
+              <view class="shopping_info_quantity">
+                <view
+                  class="quantity_but"
+                  @click="quantityFun('minus', index, addIndex, pIndex)"
+                  >-</view
+                >
+                <view class="quantity_value">{{ pItem.num }}</view>
+                <view
+                  class="quantity_but"
+                  @click="quantityFun('add', index, addIndex, pIndex)"
+                  >+</view
+                >
+              </view>
+            </view>
+          </view>
+        </view>
+        <view
+          v-else
+          class="order_item_content"
+          v-for="(pItem, pIndex) in addItem.goods"
+          :key="pItem.id"
+        >
+          <up-image
+            :src="pItem.img"
+            width="80"
+            height="80"
+            bgColor="#f1f6ff00"
+            @click="jumpProductInfo(pItem)"
+          ></up-image>
+          <view class="content_info_right">
+            <view
+              class="content_info_left_total"
+              @click="jumpProductInfo(pItem)"
+            >
+              <view class="content_info_title">{{ pItem.title }}</view>
+              <view class="content_info_tag">{{ pItem.specs }}</view>
+            </view>
+            <view class="content_info_right_total">
+              <view class="content_right_total">
+                <view
+                  >￥<text style="font-size: 36rpx">{{
+                    pItem.totalPrice
+                  }}</text></view
+                >
+                <view>每件到手价￥{{ pItem.unitPrice }}</view>
+              </view>
+              <view class="shopping_info_quantity">
+                <view
+                  class="quantity_but"
+                  @click="quantityFun('minus', index, addIndex, pIndex)"
+                  >-</view
+                >
+                <view class="quantity_value">{{ pItem.num }}</view>
+                <view
+                  class="quantity_but"
+                  @click="quantityFun('add', index, addIndex, pIndex)"
+                  >+</view
+                >
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="content_info_right_remark">
+          <view class="title">留言</view>
+          <up-input
+            placeholder="建议留言前先与商家沟通确认"
+            border="surround"
+            v-model="addItem.remark"
+            :customStyle="{
+              'text-align': 'right !important',
+              border: '0rpx',
+            }"
+            style="text-align: right"
+          ></up-input>
+        </view>
+        <!-- 运费 -->
+        <view class="order_freight_warp" v-if="orderInfo">
+          <view class="order_freight_item">
+            <view
+              >运费<text style="color: #c0c3c6; margin-left: 20rpx">{{
+                getValue(PRODUCT_DELIVERY_TIME, addItem.deliveryTime)
+              }}</text></view
+            >
+            <view class="value_">
+              {{ orderInfo.postage ? "￥" + orderInfo.postage : "包邮" }}
+            </view>
+          </view>
+          <!-- <view class="order_freight_item">
 						<view>优惠<text class="coupon_">已选优惠券</text></view>
 						<view class="value_"><text>-￥{{orderInfo.coupon}}</text></view>
 					</view> -->
-				</view>
-			</view>
+        </view>
+      </view>
+    </view>
 
-		</view>
-
-
-		<!-- 支付方式 -->
-		<!-- <view class="order_way_warp" @click="wayShowFun(true)">
+    <!-- 支付方式 -->
+    <!-- <view class="order_way_warp" @click="wayShowFun(true)">
 			<view>支付方式</view>
 			<view class="order_way_right">
 				{{ getValue(wayOption, orderInfo.paymentMethod) }}
 				<up-image src="/static/common/right.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
 			</view>
 		</view> -->
-		<view class="order_way_warp_two" >
-			<text class="text-32 text-zu">支付方式</text>
-			<up-radio-group v-model="orderInfo.paymentMethod" placement="column">
-				<view v-for="(item,index) in wayOption" :key="item.id" class="way-option" 
-				:style="{borderWidth:wayOption.length - 1 == index ? '0rpx' : '2rpx'}">
-					<view class="way-option-item" >
-						<image v-if="item.type == 'wechat'" src="@/static/new/wx.png"></image>
-						<image v-if="item.type == 'alipay'" src="@/static/new/zfb.png"></image>
-						<image v-if="item.type == 'balance'" src="@/static/new/bank.png"></image>
-						<image v-if="item.type == 'redpacket'" src="@/static/new/jf.png"></image>
-						<text v-if="item.type == 'wechat' || item.type == 'alipay'" class="text-32 text-zu" style="margin-left:20rpx">{{item.name}}</text>
-						<text v-else style="margin-left:20rpx" class="text-32 text-zu">{{item.name}}
-							<text style="color:#999;margin:0 10rpx">可用:</text>
-							{{item.balance}}
-						</text>
-					</view>
-					<up-radio :name="item.type" activeColor="#7934F6">
-					</up-radio>
-				</view>
-			</up-radio-group>
-		</view>
-		<view class="order_way_warp_two" >
-			<view class="price-view">
-				<text class="text-32 text-zu">商品总价</text>
-				<text class="text-32 text-zu text-bold">￥{{ orderInfo.amount - orderInfo.postage }}</text>
-			</view>
-			<view class="price-view">
-				<text class="text-32 text-zu">运费</text>
-				<text class="text-32 text-zu text-bold">￥{{ orderInfo.postage }}</text>
-			</view>
-			<view class="price-line"></view>
-			<view class="price-view-two">
-				<text class="text-32 text-fu1">合计</text>
-				<text class="text-32 text-zi text-bold">￥{{ orderInfo.amount }}</text>
-			</view>
-		</view>
-		<!-- 去支付的固定按钮 -->
-		<view class="order_pay_but">
-			<view class="price_">
-				<text class="text-32" style="color:#999;font-weight: 400;">共
-					<text>{{totleNum}}</text>
-				件
-				</text>
-				￥<text style="font-size: 60rpx;">{{ orderInfo.amount }}</text></view>
-			<view class="_but" @click="goPay">支付</view>
-		</view>
+    <view class="order_way_warp_two">
+      <text class="text-32 text-zu">支付方式</text>
+      <up-radio-group v-model="orderInfo.paymentMethod" placement="column">
+        <view
+          v-for="(item, index) in wayOption"
+          :key="item.id"
+          class="way-option"
+          :style="{
+            borderWidth: wayOption.length - 1 == index ? '0rpx' : '2rpx',
+          }"
+        >
+          <view class="way-option-item">
+            <image
+              v-if="item.type == 'wechat'"
+              src="@/static/new/wx.png"
+            ></image>
+            <image
+              v-if="item.type == 'alipay'"
+              src="@/static/new/zfb.png"
+            ></image>
+            <image
+              v-if="item.type == 'balance'"
+              src="@/static/new/bank.png"
+            ></image>
+            <image
+              v-if="item.type == 'redpacket'"
+              src="@/static/new/jf.png"
+            ></image>
+            <text
+              v-if="item.type == 'wechat' || item.type == 'alipay'"
+              class="text-32 text-zu"
+              style="margin-left: 20rpx"
+              >{{ item.name }}</text
+            >
+            <text v-else style="margin-left: 20rpx" class="text-32 text-zu"
+              >{{ item.name }}
+              <text style="color: #999; margin: 0 10rpx">可用:</text>
+              {{ item.balance }}
+            </text>
+          </view>
+          <up-radio :name="item.type" activeColor="#7934F6"> </up-radio>
+        </view>
+      </up-radio-group>
+    </view>
+    <view class="order_way_warp_two">
+      <view class="price-view">
+        <text class="text-32 text-zu">商品总价</text>
+        <text class="text-32 text-zu text-bold"
+          >￥{{ orderInfo.amount - orderInfo.postage }}</text
+        >
+      </view>
+      <view class="price-view">
+        <text class="text-32 text-zu">运费</text>
+        <text class="text-32 text-zu text-bold">￥{{ orderInfo.postage }}</text>
+      </view>
+      <view class="price-line"></view>
+      <view class="price-view-two">
+        <text class="text-32 text-fu1">合计</text>
+        <text class="text-32 text-zi text-bold">￥{{ orderInfo.amount }}</text>
+      </view>
+    </view>
+    <!-- 去支付的固定按钮 -->
+    <view class="order_pay_but">
+      <view class="price_">
+        <text class="text-32" style="color: #999; font-weight: 400"
+          >共
+          <text>{{ totleNum }}</text>
+          件
+        </text>
+        ￥<text style="font-size: 60rpx">{{ orderInfo.amount }}</text></view
+      >
+      <view class="_but" @click="goPay">支付</view>
+    </view>
 
-		<!-- 选择支付方式 -->
-		<up-popup v-model:show="wayShow" :round="10" :closeOnClickOverlay="false" :closeable="true"
-			:safeAreaInsetBottom="false">
-			<view class="way_popup_warp">
-				<view class="way_popup_title">支付方式</view>
-				<up-radio-group v-model="orderInfo.paymentMethod" placement="column">
-					<view v-for="item in wayOption" :key="item.id" style="margin-bottom: 10rpx;">
-						<view class="way_item">
-							<view class="way_item_">
-								<view class="way_item_val">{{ item.name }}<text v-if="item.balance">&nbsp;&nbsp;({{ item.balance
-								}})</text>
-								</view>
-							</view>
-							<view v-if="item.type === 'balance' && isShowBalance" class="go_balance_comm_warp"
-								@click="goRechargeFun(item)">去充值</view>
-							<up-radio v-else :name="item.type" activeColor="#03AD27">
-							</up-radio>
-						</view>
-						<view class="balance_comm_msg" v-if="item.type === 'balance' && isShowBalance">当前现金余额不足，如需支付请前往充值</view>
-					</view>
-				</up-radio-group>
-				<view class="popup_but" @click="wayShow = false;">
-					确认
-				</view>
-			</view>
-		</up-popup>
+    <!-- 选择支付方式 -->
+    <up-popup
+      v-model:show="wayShow"
+      :round="10"
+      :closeOnClickOverlay="false"
+      :closeable="true"
+      :safeAreaInsetBottom="false"
+    >
+      <view class="way_popup_warp">
+        <view class="way_popup_title">支付方式</view>
+        <up-radio-group v-model="orderInfo.paymentMethod" placement="column">
+          <view
+            v-for="item in wayOption"
+            :key="item.id"
+            style="margin-bottom: 10rpx"
+          >
+            <view class="way_item">
+              <view class="way_item_">
+                <view class="way_item_val"
+                  >{{ item.name
+                  }}<text v-if="item.balance"
+                    >&nbsp;&nbsp;({{ item.balance }})</text
+                  >
+                </view>
+              </view>
+              <view
+                v-if="item.type === 'balance' && isShowBalance"
+                class="go_balance_comm_warp"
+                @click="goRechargeFun(item)"
+                >去充值</view
+              >
+              <up-radio v-else :name="item.type" activeColor="#03AD27">
+              </up-radio>
+            </view>
+            <view
+              class="balance_comm_msg"
+              v-if="item.type === 'balance' && isShowBalance"
+              >当前现金余额不足，如需支付请前往充值</view
+            >
+          </view>
+        </up-radio-group>
+        <view class="popup_but" @click="wayShow = false"> 确认 </view>
+      </view>
+    </up-popup>
 
+    <!-- 选择地址 -->
+    <up-popup
+      v-model:show="addressShow"
+      :round="10"
+      :closeOnClickOverlay="false"
+      :closeable="true"
+      :safeAreaInsetBottom="false"
+      @close="checkAddressShow(false, null, 0, 0)"
+    >
+      <view class="address_popup_warp">
+        <view class="address_popup_title">收件地址</view>
+        <view class="address_popup_content">
+          <view class="address_popup_content_add" @click="addAdress">
+            + 新增地址</view
+          >
+          <Address @valueFunc="getAddressValueFunc" />
+        </view>
+        <view class="popup_but" @click="addressOk"> 确认 </view>
+      </view>
+    </up-popup>
+    <u-modal
+      :show="tipsShow"
+      title="提示"
+      showCancelButton
+      @cancel="onCancel"
+      @confirm="onConfirm"
+      :cancelText="type == 1 ? '取消' : '忘记密码'"
+      :confirmText="type == 1 ? '去设置' : '重试'"
+      confirmColor="#7934F6"
+      :content="content"
+    ></u-modal>
 
-		<!-- 选择地址 -->
-		<up-popup v-model:show="addressShow" :round="10" :closeOnClickOverlay="false" :closeable="true"
-			:safeAreaInsetBottom="false" @close="checkAddressShow(false, null, 0, 0)">
-			<view class="address_popup_warp">
-				<view class="address_popup_title">收件地址</view>
-				<view class="address_popup_content">
-					<view class="address_popup_content_add" @click="addAdress"> + 新增地址</view>
-					<Address @valueFunc="getAddressValueFunc" />
-				</view>
-				<view class="popup_but" @click="addressOk">
-					确认
-				</view>
-			</view>
-		</up-popup>
-		<u-modal :show="tipsShow" 
-		title="提示" 
-		showCancelButton 
-		@cancel="onCancel" 
-		@confirm="onConfirm" 
-		:cancelText="type == 1 ? '取消' : '忘记密码'"
-		:confirmText="type == 1 ? '去设置' : '重试'"
-		confirmColor="#7934F6"
-		:content='content'></u-modal>
-		
-		<u-keyboard ref="uKeyboard" mode="number"
-		:show="show" 
-		@change="onChange"
-		@backspace="onBackspace"
-		:dotDisabled="true"
-		:tooltip="false"
-		>
-		<view style="background-color: #fff;">
-			<view class="money">
-				<text style="color:#000;position: relative;top:40rpx">
-					<text style="font-size:48rpx">￥</text>{{orderInfo.amount }}</text>
-				<text class="text-40 " style="margin-left:20rpx"></text>
-				<view class="text-28 close" data-flag="false" @tap="showPop(false)">
-					<u-icon name="close" color="#333333" size="20"></u-icon>
-				</view>
-			</view>
-			<view class="mid-tips">
-				<u-code-input v-model="password" 
-				:dot="true"
-				borderColor="#EAEAEA"
-				:maxlength="6"
-				@finish="finish"
-				></u-code-input>
-			</view>
-			<view class="tips text-28" style="color:#999;display: inline-block;">请输入支付密码</view>
-		</view>
-		</u-keyboard>
-		
-		<up-toast ref="uToastRef"></up-toast>
-	</view>
+    <u-keyboard
+      ref="uKeyboard"
+      mode="number"
+      :show="show"
+      @change="onChange"
+      @backspace="onBackspace"
+      :dotDisabled="true"
+      :tooltip="false"
+    >
+      <view style="background-color: #fff">
+        <view class="money">
+          <text style="color: #000; position: relative; top: 40rpx">
+            <text style="font-size: 48rpx">￥</text>{{ orderInfo.amount }}</text
+          >
+          <text class="text-40" style="margin-left: 20rpx"></text>
+          <view class="text-28 close" data-flag="false" @tap="showPop(false)">
+            <u-icon name="close" color="#333333" size="20"></u-icon>
+          </view>
+        </view>
+        <view class="mid-tips">
+          <u-code-input
+            v-model="password"
+            :dot="true"
+            borderColor="#EAEAEA"
+            :maxlength="6"
+            @finish="finish"
+          ></u-code-input>
+        </view>
+        <view class="tips text-28" style="color: #999; display: inline-block"
+          >请输入支付密码</view
+        >
+      </view>
+    </u-keyboard>
+
+    <up-toast ref="uToastRef"></up-toast>
+  </view>
 </template>
 
 <script>
-import Address from '@/components/address.vue';
-import { getGoodsDetail } from '@/api/product.js';
-import { getAddress } from '@/api/address.js';
-import { PAYMENT_WAY, PAYMENT_WAY_, PRODUCT_DELIVERY_TIME, getValue, WAY_LIST } from '@/utils/enumUtils.js';
-import { getSettleList, settle, settlementOrder, updateGoodsNum } from '@/api/cart.js';
-import { getSupportPay } from '@/api/order.js';
-import { feedback } from '@/api/payment.js';
-import { assembleAddress } from '@/utils/index.js'
-import Header from '@/components/header.vue';
-import { getUserInfo } from '@/api/auth.js';
-import { appWxpayFun, zfbPayFun, jumpWayOk, jumpWayError } from '@/utils/payUtils.js'
+import Address from "@/components/address.vue";
+import { getGoodsDetail } from "@/api/product.js";
+import { getAddress } from "@/api/address.js";
+import {
+  PAYMENT_WAY,
+  PAYMENT_WAY_,
+  PRODUCT_DELIVERY_TIME,
+  getValue,
+  WAY_LIST,
+} from "@/utils/enumUtils.js";
+import {
+  getSettleList,
+  settle,
+  settlementOrder,
+  updateGoodsNum,
+} from "@/api/cart.js";
+import { getSupportPay } from "@/api/order.js";
+import { feedback } from "@/api/payment.js";
+import { assembleAddress } from "@/utils/index.js";
+import Header from "@/components/header.vue";
+import { getUserInfo } from "@/api/auth.js";
+import {
+  appWxpayFun,
+  zfbPayFun,
+  jumpWayOk,
+  jumpWayError,
+} from "@/utils/payUtils.js";
 
-import CryptoJS from 'crypto-js';
+import CryptoJS from "crypto-js";
 
 export default {
-	computed: {
-		PRODUCT_DELIVERY_TIME() {
-			return PRODUCT_DELIVERY_TIME;
-		},
-		totleNum(){
-			let num = 0;
-				
-					console.log('totleNum',JSON.parse(JSON.stringify(this.orderInfo)))
-			if(this.orderInfo && this.orderInfo.shops && this.orderInfo.shops.length){
-				let goods = this.orderInfo.shops[0].addrTimes[0].goods;
-				goods.forEach(item=>{
-					num += item.num;
-				})
-			}
-			return num;
-		},
-	},
-	components: {
-		Address,
-		Header,
-	},
-	data() {
-		return {
-			password:'',
-			payPwd:0,
-			show:false,
-			isShow:false,
-			addressListOne:[],
-			ids: 0,
-			orderInfo: {
-				// coupon:2,//优惠卷
-				paymentMethod: PAYMENT_WAY.ALIPAY,// 支付方式，暂时默认用支付宝
-				total: 4000,// 需要支付的总金额
-				address: {},// 选中的地址
-				store: [],
-			},
-			wayShow: false,
-			addressShow: false,// 收件地址选择
-			addressType: '',// 收件地址数据类型
-			addressIndex: 0,// 收件地址数据类型
-			shopsIndex: 0,// 收件地址数据类型
-			selectAddress: {},// 收件地址选择
-			wayOption: [],
-			isShowBalance: false,
-			ji: 0,
-			sed: null,
-			curPay: null,
-			user:null,
-			tipsShow:false,
-			content:'您未设置支付密码，请先去设置支付密码',
-			type:'1'
-		};
-	},
-	async onLoad(option) {
-		// const ids = option.ids;
-		if (option.sed) {
-			this.ji = 1;
-			this.sed = JSON.parse(option.sed)
-			this.getOrderTwo();
-		}
-		if (option.ids) {
-			this.ids = option.ids;
-			await this.addressList();
-			this.getOrder();
-		}
-		console.log("参数---", option)
+  computed: {
+    PRODUCT_DELIVERY_TIME() {
+      return PRODUCT_DELIVERY_TIME;
+    },
+    totleNum() {
+      let num = 0;
 
-		const addressShowPop = option.addressShow;
-		if (addressShowPop && addressShowPop !== "null") {
-			this.addressShow = addressShowPop;
-		}
-		// 支付弹框
-		// const payOpen = option.payOpen;
-		// if (payOpen && payOpen !== "null") {
-		// 	this.getWayOption();
-		// 	this.wayShow = payOpen;
-		// }
-		this.getWayOption();
-        this.getUserInfo();
-	},
-	mounted() {
+      console.log("totleNum", JSON.parse(JSON.stringify(this.orderInfo)));
+      if (
+        this.orderInfo &&
+        this.orderInfo.shops &&
+        this.orderInfo.shops.length
+      ) {
+        let goods = this.orderInfo.shops[0].addrTimes[0].goods;
+        goods.forEach((item) => {
+          num += item.num;
+        });
+      }
+      return num;
+    },
+  },
+  components: {
+    Address,
+    Header,
+  },
+  data() {
+    return {
+      password: "",
+      payPwd: 0,
+      show: false,
+      isShow: false,
+      addressListOne: [],
+      ids: 0,
+      orderInfo: {
+        // coupon:2,//优惠卷
+        paymentMethod: PAYMENT_WAY.ALIPAY, // 支付方式，暂时默认用支付宝
+        total: 4000, // 需要支付的总金额
+        address: {}, // 选中的地址
+        store: [],
+      },
+      wayShow: false,
+      addressShow: false, // 收件地址选择
+      addressType: "", // 收件地址数据类型
+      addressIndex: 0, // 收件地址数据类型
+      shopsIndex: 0, // 收件地址数据类型
+      selectAddress: {}, // 收件地址选择
+      wayOption: [],
+      isShowBalance: false,
+      ji: 0,
+      sed: null,
+      curPay: null,
+      user: null,
+      tipsShow: false,
+      content: "您未设置支付密码，请先去设置支付密码",
+      type: "1",
+      defaultAddress: "",
+    };
+  },
+  async onLoad(option) {
+    // const ids = option.ids;
+    if (option.sed) {
+      this.ji = 1;
+      this.sed = JSON.parse(option.sed);
+      this.getOrderTwo();
+    }
+	if (option.address) {
+      this.defaultAddress = option.address;
+    }
+    if (option.ids) {
+      this.ids = option.ids;
+      await this.addressList();
+      this.getOrder();
+    }
+  
+    console.log("参数---", option,this.defaultAddress);
 
-	},
-	methods: {
-		getValue,
-		assembleAddress,
-		async addressList() {
-			const res = await getAddress();
-			if (res && res.bizcode === 100) {
-				this.addressListOne = res.data;
-			}
-			
-		},
-		onBackspace(e){
-			if(this.password.length>0){
-				this.password = this.password.substring(0,this.password.length-1);
-			}
-		},
-		showPop(flag = true){
-		 	this.password = '';
-		 	this.show = flag;
-		},
-		finish(){
-			console.log(11111)
-		},
-		onChange(val){
-			
-			if(this.password.length<6){
-				this.password += val;
-			}
-			if(this.password.length>=6){
-				this.show = false;
-				this.payPwd = this.password;
-				this.password = '';
-				setTimeout(()=>{
-					this.passPay();
-				},300)
-				// this.checkPayPwd();
-			}
-		},
-		onCancel(){
-			if(this.type == '2'){
-				uni.redirectTo({
-					url:'/pages/rwa_package/setting/forgot-pass?type=1'
-				})
-			}
-			this.tipsShow = false;
-		},
-		onConfirm(){
-			if(this.type == '1'){
-				uni.redirectTo({
-					url:'/pages/rwa_package/setting/forgot-pass?type=1'
-				})
-			}else{
-				this.tipsShow = false;
-				this.passShow = true;
-			}
-		},
-		async getUserInfo() {
-		    const result = await getUserInfo();
-		    if (result && result.bizcode === 100) {
-		        const data = result.data;
-		        this.user = result.data || {};
-		    }
-		},
-		// 增加收货地址
-		addAdress() {
-			const ids = this.ids;
-			// addressShow = true;
-			uni.navigateTo({
-				url: "/pages/mine_package/mine_address_add/mine_address_add?ids=" + ids,
-			})
-		},
-		wayShowFun(type) {
-			if (type) {
-				this.getWayOption();
-			}
-			this.wayShow = type;
-		},
-		async getWayOption() {
-			let parmas = {
-			}
-			if (this.ji) {
-				parmas['types'] = '4';
-			} else {
-				parmas['types'] = '1,2,3';
-			}
-			const result = await getSupportPay(parmas);
-			if (result && result.bizcode === 100) {
-				const data = result.data || [];
-				const amount = this.orderInfo.amount;
-				let flag = data.some(item => ['wechat', 'alipay'].includes(item.type));
-				// 没有支付宝和微信支付
-				// if (flag) {
-				// 	this.isShowBalance = false;
-				// } else {
-				// 	const balanceFlag = data.some(item => item.type === "balance" && item.balance < amount);
-				// 	this.isShowBalance = balanceFlag;
-				// }
-				this.wayOption = data;
-				console.log('getWayOption', this.wayOption)
-			}
-		},
-		async getOrder() {
-			const ids = this.ids;
-			if (!ids || ids === 0) {
-				this.$refs.uToastRef.show({
-					type: 'error',
-					message: "暂时没有需要结算的订单",
-				});
-				setTimeout(() => {
-					uni.switchTab({
-						url: '/pages/shopping_cart/shopping_cart',
-					})
-				}, 2000)
-				return;
-			}
-			let address = null;
-			if(this.addressListOne.length){
-				let arr = this.addressListOne.filter(i=>i.isDefault)
-				if(arr.length){
-					address = arr[0];
-				}else{
-					address = this.addressListOne[0];
-				}
-			}
-			const params = {
-				cartIds: ids
-			}
-			if(address){
-				params['addrId'] = address.id
-			}
-			const resp = await getSettleList(params);
-			if (resp && resp.bizcode === 100) {
-				const data = resp.data;
-				const shops = data.shops;
-				if (shops && shops.length !== 0) {
-					shops.map(item => {
-						item.addrTimes.map(addItem => {
-							addItem.remark = null;
-						})
-					})
-				}
-				data.shops = shops;
-				data.paymentMethod = null;// 支付方式
-				this.orderInfo = data;
-				console.log('orderInfoorderInfo',this.orderInfo)
-			}
-		},
-		async getOrderTwo() {
-			const params = {
-				id: this.sed.id,
-			}
-			const resp = await getGoodsDetail(params);
-			if (resp && resp.bizcode === 100) {
-				const data = resp.data;
-				this.ji = data.type == 3 ? 1 : 0;
-				this.orderInfo = {
-					address: null,
-					amount: this.sed.goodsNum * this.sed.specsId.price,
-					shops: [{
-						addrTimes: [
-							{
-								address: null,
-								deliveryTime: data.deliveryTime,
-								postagesId: data.postagesId,
-								postagesType: 1,
-								postage:0,
-								goods: [
-									{
-										adress: null,
-										addressId: null,
-										areaName: null,
-										cityName: null,
-										townshipName:null,
-										goodsId: this.sed.id,
-										id: this.sed.specsId.id,
-										img: data.goodsGraph.split(',')[0],
-										name: null,
-										num: this.sed.goodsNum,
-										phone: null,
-										provinceName: null,
-										specs: this.sed.specsId.combNames,
-										title: data.name,
-										totalPrice: this.sed.goodsNum * this.sed.specsId.price,
-										unitPrice: this.sed.specsId.price
+    const addressShowPop = option.addressShow;
+    if (addressShowPop && addressShowPop !== "null") {
+      this.addressShow = addressShowPop;
+    }
+    // 支付弹框
+    // const payOpen = option.payOpen;
+    // if (payOpen && payOpen !== "null") {
+    // 	this.getWayOption();
+    // 	this.wayShow = payOpen;
+    // }
+    this.getWayOption();
+    this.getUserInfo();
+  },
+  mounted() {},
+  methods: {
+    getValue,
+    assembleAddress,
+    async addressList() {
+      const res = await getAddress();
+      if (res && res.bizcode === 100) {
+        this.addressListOne = res.data;
+      }
+    },
+    onBackspace(e) {
+      if (this.password.length > 0) {
+        this.password = this.password.substring(0, this.password.length - 1);
+      }
+    },
+    showPop(flag = true) {
+      this.password = "";
+      this.show = flag;
+    },
+    finish() {
+      console.log(11111);
+    },
+    onChange(val) {
+      if (this.password.length < 6) {
+        this.password += val;
+      }
+      if (this.password.length >= 6) {
+        this.show = false;
+        this.payPwd = this.password;
+        this.password = "";
+        setTimeout(() => {
+          this.passPay();
+        }, 300);
+        // this.checkPayPwd();
+      }
+    },
+    onCancel() {
+      if (this.type == "2") {
+        uni.redirectTo({
+          url: "/pages/rwa_package/setting/forgot-pass?type=1",
+        });
+      }
+      this.tipsShow = false;
+    },
+    onConfirm() {
+      if (this.type == "1") {
+        uni.redirectTo({
+          url: "/pages/rwa_package/setting/forgot-pass?type=1",
+        });
+      } else {
+        this.tipsShow = false;
+        this.passShow = true;
+      }
+    },
+    async getUserInfo() {
+      const result = await getUserInfo();
+      if (result && result.bizcode === 100) {
+        const data = result.data;
+        this.user = result.data || {};
+      }
+    },
+    // 增加收货地址
+    addAdress() {
+      const ids = this.ids;
+      // addressShow = true;
+      uni.navigateTo({
+        url: "/pages/mine_package/mine_address_add/mine_address_add?ids=" + ids,
+      });
+    },
+    wayShowFun(type) {
+      if (type) {
+        this.getWayOption();
+      }
+      this.wayShow = type;
+    },
+    async getWayOption() {
+      let parmas = {};
+      if (this.ji) {
+        parmas["types"] = "4";
+      } else {
+        parmas["types"] = "1,2,3";
+      }
+      const result = await getSupportPay(parmas);
+      if (result && result.bizcode === 100) {
+        const data = result.data || [];
+        const amount = this.orderInfo.amount;
+        let flag = data.some((item) =>
+          ["wechat", "alipay"].includes(item.type)
+        );
+        // 没有支付宝和微信支付
+        // if (flag) {
+        // 	this.isShowBalance = false;
+        // } else {
+        // 	const balanceFlag = data.some(item => item.type === "balance" && item.balance < amount);
+        // 	this.isShowBalance = balanceFlag;
+        // }
+        this.wayOption = data;
+        console.log("getWayOption", this.wayOption);
+      }
+    },
+    async getOrder() {
+      const ids = this.ids;
+      if (!ids || ids === 0) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "暂时没有需要结算的订单",
+        });
+        setTimeout(() => {
+          uni.switchTab({
+            url: "/pages/shopping_cart/shopping_cart",
+          });
+        }, 2000);
+        return;
+      }
+      let address = null;
+      if (this.defaultAddress) {
+        address = this.addressListOne.find(
+          (item) => item.id == this.defaultAddress
+        );
+      } else {
+        if (this.addressListOne.length) {
+          let arr = this.addressListOne.filter((i) => i.isDefault);
+          if (arr.length) {
+            address = arr[0];
+          } else {
+            address = this.addressListOne[0];
+          }
+        }
+      }
+      const params = {
+        cartIds: ids,
+      };
+      if (address) {
+        params["addrId"] = address.id;
+      }
+      const resp = await getSettleList(params);
+      if (resp && resp.bizcode === 100) {
+        const data = resp.data;
+        const shops = data.shops;
+        if (shops && shops.length !== 0) {
+          shops.map((item) => {
+            item.addrTimes.map((addItem) => {
+              addItem.remark = null;
+            });
+          });
+        }
+        data.shops = shops;
+        data.paymentMethod = null; // 支付方式
+        this.orderInfo = data;
+        console.log("orderInfoorderInfo", this.orderInfo);
+      }
+    },
+    async getOrderTwo() {
+      const params = {
+        id: this.sed.id,
+      };
+      const resp = await getGoodsDetail(params);
+      if (resp && resp.bizcode === 100) {
+        const data = resp.data;
+        this.ji = data.type == 3 ? 1 : 0;
+        this.orderInfo = {
+          address: null,
+          amount: this.sed.goodsNum * this.sed.specsId.price,
+          shops: [
+            {
+              addrTimes: [
+                {
+                  address: null,
+                  deliveryTime: data.deliveryTime,
+                  postagesId: data.postagesId,
+                  postagesType: 1,
+                  postage: 0,
+                  goods: [
+                    {
+                      adress: null,
+                      addressId: null,
+                      areaName: null,
+                      cityName: null,
+                      townshipName: null,
+                      goodsId: this.sed.id,
+                      id: this.sed.specsId.id,
+                      img: data.goodsGraph.split(",")[0],
+                      name: null,
+                      num: this.sed.goodsNum,
+                      phone: null,
+                      provinceName: null,
+                      specs: this.sed.specsId.combNames,
+                      title: data.name,
+                      totalPrice: this.sed.goodsNum * this.sed.specsId.price,
+                      unitPrice: this.sed.specsId.price,
+                    },
+                  ],
+                },
+              ],
+              id: data.shop.id,
+              logo: data.shop.logo,
+              name: data.shop.name,
+            },
+          ],
+        };
+        this.orderInfo.paymentMethod = null;
+      }
+      // const params = {
+      // 	cartIds: ids,
+      // }
+      // const resp = await getSettleList(params);
+      // if (resp && resp.bizcode === 100) {
+      // 	const data = resp.data;
+      // 	const shops = data.shops;
+      // 	if (shops && shops.length !== 0) {
+      // 		shops.map(item => {
+      // 			item.addrTimes.map(addItem => {
+      // 				addItem.remark = null;
+      // 			})
+      // 		})
+      // 	}
+      // 	data.shops = shops;
+      // 	data.paymentMethod = null;// 支付方式
+      // 	this.orderInfo = data;
+      // }
+    },
+    /**
+     * 数量进行增加删除
+     * @param {Object} type 区分是 + 还是 -
+     * @param {Object} pIndex 父节点数据，用作与从新修改数据
+     * @param {Object} addIndex 需要修改店铺的数据节点
+     * @param {Object} index 需要修改的数据节点
+     */
+    async quantityFun(type, index, addIndex, pIndex) {
+      console.log("数量进行增加删除---", this.orderInfo);
 
-									}
-								]
+      const data =
+        this.orderInfo.shops[index].addrTimes[addIndex].goods[pIndex];
 
-							}
-						], id: data.shop.id, logo: data.shop.logo, name: data.shop.name
-					}]
-				};
-				this.orderInfo.paymentMethod = null;
+      // 起订倍数
+      const minBuyNum = data.minBuyNum || 1; // 起订倍数
+      const step = Math.max(minBuyNum, 1);
 
-			}
-			// const params = {
-			// 	cartIds: ids,
-			// }
-			// const resp = await getSettleList(params);
-			// if (resp && resp.bizcode === 100) {
-			// 	const data = resp.data;
-			// 	const shops = data.shops;
-			// 	if (shops && shops.length !== 0) {
-			// 		shops.map(item => {
-			// 			item.addrTimes.map(addItem => {
-			// 				addItem.remark = null;
-			// 			})
-			// 		})
-			// 	}
-			// 	data.shops = shops;
-			// 	data.paymentMethod = null;// 支付方式
-			// 	this.orderInfo = data;
-			// }
-		},
-		/**
-		 * 数量进行增加删除
-		 * @param {Object} type 区分是 + 还是 -
-		 * @param {Object} pIndex 父节点数据，用作与从新修改数据
-		 * @param {Object} addIndex 需要修改店铺的数据节点
-		 * @param {Object} index 需要修改的数据节点
-		 */
-		async quantityFun(type, index, addIndex, pIndex) {
-			console.log("数量进行增加删除---",this.orderInfo,)
+      let currentQuantity = Number(data.num); // 当前数量
+      let currentTotalPrice = Number(data.totalPrice); // 当前金额
+      let currentAmount = Number(this.orderInfo.amount); // 总金额
+      if (type === "minus") {
+        if (currentQuantity === 1) {
+          this.$refs.uToastRef.show({
+            type: "error",
+            message: "不能再减拉，不能小于最低购买数量~",
+          });
+        } else {
+          currentQuantity = currentQuantity - step;
+          currentAmount = currentAmount - data.unitPrice;
+          currentTotalPrice = currentTotalPrice - data.unitPrice;
+        }
+      } else if (type === "add") {
+        // 需要判断一下库存
+        currentQuantity = currentQuantity + step;
+        currentAmount = currentAmount + data.unitPrice;
+        currentTotalPrice = currentTotalPrice + data.unitPrice;
+      }
+      const params = {
+        id: data.id,
+        goodsNum: currentQuantity,
+      };
+      const result = await updateGoodsNum(params);
+      if (result && result.bizcode === 100) {
+        this.orderInfo.shops[index].addrTimes[addIndex].goods[pIndex].num =
+          currentQuantity;
+        this.orderInfo.shops[index].addrTimes[addIndex].goods[
+          pIndex
+        ].totalPrice = currentTotalPrice.toFixed(2);
+        this.orderInfo.amount = currentAmount.toFixed(2);
+      }
+    },
 
-			const data = this.orderInfo.shops[index].addrTimes[addIndex].goods[pIndex];
+    // 获取备注
+    getRemark() {
+      const orderInfo = this.orderInfo;
+      const remarkArr = [];
+      if (orderInfo && Object.keys(orderInfo).length !== 0) {
+        const remarObj = {};
+        if (orderInfo.shops && orderInfo.shops.length !== 0) {
+          orderInfo.shops.map((sItem) => {
+            if (sItem.addrTimes && sItem.addrTimes.length !== 0) {
+              sItem.addrTimes.map((addItem) => {
+                if (addItem.remark) {
+                  remarObj.gkey = addItem.groupKey;
+                  remarObj.rmk = addItem.remark;
+                }
+              });
+            }
+          });
+        }
+        remarkArr.push(remarObj);
+      }
+      return remarkArr;
+    },
+    /**
+     * 去支付
+     */
+    async goPay() {
+      console.log("getWayOption", this.wayOption, this.orderInfo);
+      const orderInfo = this.orderInfo;
 
-			// 起订倍数
-			 const minBuyNum =data.minBuyNum || 1; // 起订倍数
-			 const step = Math.max(minBuyNum, 1);
+      if (!orderInfo.address || Object.keys(orderInfo.address).length === 0) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "请选择收货地址",
+        });
+        return;
+      }
 
-			let currentQuantity = Number(data.num);// 当前数量
-			let currentTotalPrice = Number(data.totalPrice);// 当前金额
-			let currentAmount = Number(this.orderInfo.amount);// 总金额
-			if (type === "minus") {
-				if (currentQuantity === 1) {
-					this.$refs.uToastRef.show({
-						type: 'error',
-						message: "不能再减拉，不能小于最低购买数量~",
-					}); 
-				} else {
-					currentQuantity = currentQuantity - step;
-					currentAmount = currentAmount - data.unitPrice;
-					currentTotalPrice = currentTotalPrice - data.unitPrice;
-				}
-			} else if (type === "add") {
-				// 需要判断一下库存
-				currentQuantity = currentQuantity + step;
-				currentAmount = currentAmount + data.unitPrice;
-				currentTotalPrice = currentTotalPrice + data.unitPrice;
-			}
-			const params = {
-				id: data.id,
-				goodsNum: currentQuantity,
-			}
-			const result = await updateGoodsNum(params);
-			if (result && result.bizcode === 100) {
-				this.orderInfo.shops[index].addrTimes[addIndex].goods[pIndex].num = currentQuantity;
-				this.orderInfo.shops[index].addrTimes[addIndex].goods[pIndex].totalPrice = currentTotalPrice.toFixed(2);
-				this.orderInfo.amount = currentAmount.toFixed(2);
-			}
-		},
+      const way = orderInfo.paymentMethod;
+      if (!way || way === 0) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "请先选择支付方式",
+        });
+        return;
+      }
+      let arr = this.wayOption.filter((i) => i.type == orderInfo.paymentMethod);
+      if (arr.length) {
+        if (arr[0].type == "balance" || arr[0].type == "redpacket") {
+          if (arr[0].balance < orderInfo.amount) {
+            this.$refs.uToastRef.show({
+              type: "error",
+              message: "余额不足",
+            });
+            return;
+          }
+        }
+      } else {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "请先选择支付方式",
+        });
+        return;
+      }
 
-		// 获取备注
-		getRemark() {
-			const orderInfo = this.orderInfo;
-			const remarkArr = [];
-			if (orderInfo && Object.keys(orderInfo).length !== 0) {
-				const remarObj = {};
-				if (orderInfo.shops && orderInfo.shops.length !== 0) {
-					orderInfo.shops.map(sItem => {
-						if (sItem.addrTimes && sItem.addrTimes.length !== 0) {
-							sItem.addrTimes.map(addItem => {
-								if (addItem.remark) {
-									remarObj.gkey = addItem.groupKey;
-									remarObj.rmk = addItem.remark;
-								}
-							})
-						}
-					})
-				}
-				remarkArr.push(remarObj);
-			}
-			return remarkArr;
-		},
-		/**
-		 * 去支付
-		 */
-		async goPay() {
+      if (!this.user.tradePassword) {
+        return (this.tipsShow = true);
+      }
 
-			console.log('getWayOption', this.wayOption, this.orderInfo)
-			const orderInfo = this.orderInfo;
+      if (arr.length) {
+        if (arr[0].type == "balance" || arr[0].type == "redpacket") {
+          this.show = true;
+        } else {
+          this.passPay();
+        }
+      } else {
+        this.passPay();
+      }
+    },
+    async passPay() {
+      const params = {
+        addrId: this.orderInfo.address.id, // 收货地址ID
+        //结算的购物车ID，多个以逗号分割，ALL表示全选
+        payway: this.orderInfo.paymentMethod, // 支付方式：1-微信，2-支付宝
+        remark: JSON.stringify(this.getRemark()), //备注信息'[{"sid":"店铺ID","rmk":"备注内容"},{"sid":"店铺ID","rmk":"备注内容"}]'
+      };
+      let resp = null;
+      if (this.sed) {
+        if (
+          this.orderInfo.paymentMethod == "balance" ||
+          this.orderInfo.paymentMethod == "redpacket"
+        ) {
+          params["password"] = CryptoJS.MD5(this.payPwd).toString();
+        }
+        params["goodsId"] = this.sed.id;
+        params["specsId"] = this.sed.specsId.id;
+        params["goodsNum"] = this.orderInfo.shops[0].addrTimes[0].goods[0].num;
+        resp = await settlementOrder(params);
+      } else {
+        params["cartIds"] = this.ids;
+        if (
+          this.orderInfo.paymentMethod == "balance" ||
+          this.orderInfo.paymentMethod == "redpacket"
+        ) {
+          params["password"] = CryptoJS.MD5(this.payPwd).toString();
+        }
+        resp = await settle(params);
+      }
 
-			if (!orderInfo.address || Object.keys(orderInfo.address).length === 0) {
-				this.$refs.uToastRef.show({
-					type: 'error',
-					message: "请选择收货地址",
-				});
-				return;
-			}
+      console.log("getWayOption", resp);
 
-			const way = orderInfo.paymentMethod;
-			if (!way || way === 0) {
-				this.$refs.uToastRef.show({
-					type: 'error',
-					message: "请先选择支付方式",
-				});
-				return;
-			}
-			let arr = this.wayOption.filter(i => i.type == orderInfo.paymentMethod);
-			if (arr.length) {
-				if (arr[0].type == 'balance' || arr[0].type == 'redpacket') {
-					if (arr[0].balance < orderInfo.amount) {
-						this.$refs.uToastRef.show({
-							type: 'error',
-							message: "余额不足",
-						});
-						return;
-					}
-				}
-			} else {
-				this.$refs.uToastRef.show({
-					type: 'error',
-					message: "请先选择支付方式",
-				});
-				return;
-			}
-			
-			if(!this.user.tradePassword){
-				return this.tipsShow = true;
-			}
-			
-			if (arr.length) {
-				if (arr[0].type == 'balance' || arr[0].type == 'redpacket') {
-					this.show = true;
-				}else{
-					this.passPay()
-				}
-			}else{
-				this.passPay()
-			}
-			
-		},
-		async passPay(){
-			const params = {
-				addrId: this.orderInfo.address.id,// 收货地址ID
-				//结算的购物车ID，多个以逗号分割，ALL表示全选
-				payway: this.orderInfo.paymentMethod,// 支付方式：1-微信，2-支付宝
-				remark: JSON.stringify(this.getRemark()),//备注信息'[{"sid":"店铺ID","rmk":"备注内容"},{"sid":"店铺ID","rmk":"备注内容"}]'
-			}
-			let resp = null;
-			if (this.sed) {
-				if(this.orderInfo.paymentMethod == 'balance' || this.orderInfo.paymentMethod == 'redpacket'){
-					params['password'] = CryptoJS.MD5(this.payPwd).toString();
-				}
-				params['goodsId'] = this.sed.id;
-				params['specsId'] = this.sed.specsId.id;
-				params['goodsNum'] = this.orderInfo.shops[0].addrTimes[0].goods[0].num;
-				resp = await settlementOrder(params);
-			} else {
-				params['cartIds'] = this.ids;
-				if(this.orderInfo.paymentMethod == 'balance' || this.orderInfo.paymentMethod == 'redpacket'){
-					params['password'] = CryptoJS.MD5(this.payPwd).toString();
-				}
-				resp = await settle(params);
-			}
-			
-			console.log('getWayOption', resp)
-			
-			
-			// 提交订单成功，就唤起支付
-			if (resp && resp.bizcode === 100) {
-				const item = resp.data;
-				if (item.status === 1) {
-					jumpWayOk();
-					return;
-				}
-				if (item.wechat && Object.keys(item.wechat).length !== 0) {
-					this.appWxpay(item.wechat, item.orderId, item.orderNum);
-				} else if (item.alipay && Object.keys(item.alipay).length !== 0 && item.alipay) {
-					this.zfbPay(item.alipay, item.orderId, item.orderNum);
-				} else {
-					this.$refs.uToastRef.show({
-						type: 'error',
-						message: "订单支付失败",
-					});
-					setTimeout(() => {
-						jumpWayError()
-					}, 2000)
-				}
-			} else {
-				this.getOrder();
-			}
-		},
-		// app 微信支付
-		async appWxpay(alipay, orderId, orderNum) {
-			try {
-				const result = await appWxpayFun(alipay, orderId, orderNum);
-				console.log('支付成功', result);
-				// 处理支付成功后的逻辑，如更新订单状态等
-			} catch (error) {
-				console.error('支付失败', error);
-				// 处理支付失败后的逻辑，如提示用户等
-			}
-		},
-		// 支付宝支付
-		async zfbPay(alipay, orderId, orderNum) {
-			try {
-				const result = await zfbPayFun(alipay, orderId, orderNum);
-				console.log('支付成功', result);
-				// 处理支付成功后的逻辑，如更新订单状态等
-			} catch (error) {
-				console.error('支付失败', error);
-				// 处理支付失败后的逻辑，如提示用户等
-			}
-		},
-		// 地址选中
-		getAddressValueFunc(item) {
-			const addressObj = item;
-			addressObj.addressStr = assembleAddress(addressObj).names;
-			this.selectAddress = addressObj;
-		},
-		// 地址选中OK
-		async addressOk() {
-			console.log('this.selectAddress',this.selectAddress)
-			const type = this.addressType;
-			const addressIndex = this.addressIndex;
-			const shopsIndex = this.shopsIndex;
-			if (type === 'data') {
-				this.orderInfo.address = this.selectAddress;
-			} else if (type === 'addrTimes') {
-				this.orderInfo.shops[shopsIndex].addrTimes[addressIndex].address = this.selectAddress;
-			}
-			this.addressShow = this.false;
-			if(this.selectAddress && !this.sed){
-				const params = {
-					cartIds: this.ids,
-					addrId:this.selectAddress.id
-				}
-				const resp = await getSettleList(params);
-				if (resp && resp.bizcode === 100) {
-					const data = resp.data;
-					const shops = data.shops;
-					if (shops && shops.length !== 0) {
-						shops.map(item => {
-							item.addrTimes.map(addItem => {
-								addItem.remark = null;
-							})
-						})
-					}
-					data.shops = shops;
-					data.paymentMethod = null;// 支付方式
-					this.orderInfo = data;
-				}
-			}
-		},
-		// 地址类型
-		checkAddressShow(status, type, addIndex, index) {
-			this.addressShow = status;
-			this.addressType = type;
-			this.addressIndex = addIndex;
-			this.shopsIndex = index;
-		},
-		jumpProductInfo(item) {
-			uni.navigateTo({
-				url: "/pages/other_package/productInfo/productInfo?id=" + item.goodsId,
-			})
-		},
-		/**
-		 * 去充值
-		 */
-		goRechargeFun(item) {
-			uni.navigateTo({
-				url: "/pages/mine_package/mine_purse_recharge/mine_purse_recharge?category=balance&amount=" + item.balance + "&back=submit&id=" + this.ids,
-			})
-		}
-	}
-}
+      // 提交订单成功，就唤起支付
+      if (resp && resp.bizcode === 100) {
+        const item = resp.data;
+        if (item.status === 1) {
+          jumpWayOk();
+          return;
+        }
+        if (item.wechat && Object.keys(item.wechat).length !== 0) {
+          this.appWxpay(item.wechat, item.orderId, item.orderNum);
+        } else if (
+          item.alipay &&
+          Object.keys(item.alipay).length !== 0 &&
+          item.alipay
+        ) {
+          this.zfbPay(item.alipay, item.orderId, item.orderNum);
+        } else {
+          this.$refs.uToastRef.show({
+            type: "error",
+            message: "订单支付失败",
+          });
+          setTimeout(() => {
+            jumpWayError();
+          }, 2000);
+        }
+      } else {
+        this.getOrder();
+      }
+    },
+    // app 微信支付
+    async appWxpay(alipay, orderId, orderNum) {
+      try {
+        const result = await appWxpayFun(alipay, orderId, orderNum);
+        console.log("支付成功", result);
+        // 处理支付成功后的逻辑，如更新订单状态等
+      } catch (error) {
+        console.error("支付失败", error);
+        // 处理支付失败后的逻辑，如提示用户等
+      }
+    },
+    // 支付宝支付
+    async zfbPay(alipay, orderId, orderNum) {
+      try {
+        const result = await zfbPayFun(alipay, orderId, orderNum);
+        console.log("支付成功", result);
+        // 处理支付成功后的逻辑，如更新订单状态等
+      } catch (error) {
+        console.error("支付失败", error);
+        // 处理支付失败后的逻辑，如提示用户等
+      }
+    },
+    // 地址选中
+    getAddressValueFunc(item) {
+      const addressObj = item;
+      addressObj.addressStr = assembleAddress(addressObj).names;
+      this.selectAddress = addressObj;
+    },
+    // 地址选中OK
+    async addressOk() {
+      console.log("this.selectAddress", this.selectAddress);
+      const type = this.addressType;
+      const addressIndex = this.addressIndex;
+      const shopsIndex = this.shopsIndex;
+      if (type === "data") {
+        this.orderInfo.address = this.selectAddress;
+      } else if (type === "addrTimes") {
+        this.orderInfo.shops[shopsIndex].addrTimes[addressIndex].address =
+          this.selectAddress;
+      }
+      this.addressShow = this.false;
+      if (this.selectAddress && !this.sed) {
+        const params = {
+          cartIds: this.ids,
+          addrId: this.selectAddress.id,
+        };
+        const resp = await getSettleList(params);
+        if (resp && resp.bizcode === 100) {
+          const data = resp.data;
+          const shops = data.shops;
+          if (shops && shops.length !== 0) {
+            shops.map((item) => {
+              item.addrTimes.map((addItem) => {
+                addItem.remark = null;
+              });
+            });
+          }
+          data.shops = shops;
+          data.paymentMethod = null; // 支付方式
+          this.orderInfo = data;
+        }
+      }
+    },
+    // 地址类型
+    checkAddressShow(status, type, addIndex, index) {
+      this.addressShow = status;
+      this.addressType = type;
+      this.addressIndex = addIndex;
+      this.shopsIndex = index;
+    },
+    jumpProductInfo(item) {
+      uni.navigateTo({
+        url: "/pages/other_package/productInfo/productInfo?id=" + item.goodsId,
+      });
+    },
+    /**
+     * 去充值
+     */
+    goRechargeFun(item) {
+      uni.navigateTo({
+        url:
+          "/pages/mine_package/mine_purse_recharge/mine_purse_recharge?category=balance&amount=" +
+          item.balance +
+          "&back=submit&id=" +
+          this.ids,
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.order_way_warp_two{
-		width:100%;
-		padding: 32rpx 32rpx 0;
-		display: flex;
-		flex-direction: column;
-		box-sizing: border-box;
-		background-color: #fff;
-		border-radius: 16rpx;
-		margin-top:24rpx;
-		.price-view-two{
-			width:100%;
-			height:108rpx;
-			display: flex;
-			flex-direction: row;
-			justify-content: flex-end;
-			align-items: center;
-		}
-		.price-line{
-			width:100%;
-			min-height:1rpx;
-			background-color: #ECECEC;
-		}
-		.price-view{
-			width:100%;
-			height:72rpx;
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			
-			
-		}
-		.way-option{
-			height:112rpx;
-			width:100%;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			border-bottom:1rpx solid #ececec;
-			justify-content: space-between;
-			.way-option-item{
-				height:112rpx;
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				image{
-					width:48rpx;
-					height:48rpx;
-				}
-			}
-		}
-	}
-	.money{
-		text-align: center;
-		font-size: 68rpx;
-		color: #ff9918;
-		position: relative;
-		background-color: #fff;
-		height:180rpx;
-		.close{
-			position: absolute;
-			top: 20rpx;
-			right: 40rpx;
-			line-height: 28rpx;
-			font-size: 28rpx;
-		}
-	
-	}
-	.mid-tips{
-		width:100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	.tips{
-		color:$u-tips-color;
-		margin:20rpx 0;
-		text-align: center;
-		background-color: #fff;
-		width:100%;
-	}
+.order_way_warp_two {
+  width: 100%;
+  padding: 32rpx 32rpx 0;
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin-top: 24rpx;
+  .price-view-two {
+    width: 100%;
+    height: 108rpx;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    align-items: center;
+  }
+  .price-line {
+    width: 100%;
+    min-height: 1rpx;
+    background-color: #ececec;
+  }
+  .price-view {
+    width: 100%;
+    height: 72rpx;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+  .way-option {
+    height: 112rpx;
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    border-bottom: 1rpx solid #ececec;
+    justify-content: space-between;
+    .way-option-item {
+      height: 112rpx;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      image {
+        width: 48rpx;
+        height: 48rpx;
+      }
+    }
+  }
+}
+.money {
+  text-align: center;
+  font-size: 68rpx;
+  color: #ff9918;
+  position: relative;
+  background-color: #fff;
+  height: 180rpx;
+  .close {
+    position: absolute;
+    top: 20rpx;
+    right: 40rpx;
+    line-height: 28rpx;
+    font-size: 28rpx;
+  }
+}
+.mid-tips {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.tips {
+  color: $u-tips-color;
+  margin: 20rpx 0;
+  text-align: center;
+  background-color: #fff;
+  width: 100%;
+}
 .order_submit_warp {
-	background-color: $app-bj;
-	height: calc(100vh - 200rpx);
-	padding: 20rpx;
-	overflow-y: auto;
+  background-color: $app-bj;
+  height: calc(100vh - 200rpx);
+  padding: 20rpx;
+  overflow-y: auto;
 }
 
 .order_submit_header_warp {
-	background: #FFFFFF;
-	border-radius: 24rpx;
-	padding: 30rpx;
+  background: #ffffff;
+  border-radius: 24rpx;
+  padding: 30rpx;
 
-	.header_areaAddress_warp {
-		display: flex;
-		font-weight: 500;
-		font-size: 26rpx;
-		color: #222222;
+  .header_areaAddress_warp {
+    display: flex;
+    font-weight: 500;
+    font-size: 26rpx;
+    color: #222222;
 
-		.tab-comm {
-			color: #FFFFFF;
-			border-radius: 8rpx;
-			width: 58rpx;
-			font-size: 24rpx;
-			font-weight: 500;
-			margin-right: 10rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
+    .tab-comm {
+      color: #ffffff;
+      border-radius: 8rpx;
+      width: 58rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      margin-right: 10rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
 
-		.areaAddress_default {
-			background: #FD2A53;
-		}
+    .areaAddress_default {
+      background: #fd2a53;
+    }
 
-		.areaAddress_tab {
-			background: #4D88FE;
-		}
-	}
+    .areaAddress_tab {
+      background: #4d88fe;
+    }
+  }
 
-	.header_detailedAddress_warp {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #222222;
-		margin-top: 10rpx;
-	}
+  .header_detailedAddress_warp {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #222222;
+    margin-top: 10rpx;
+  }
 
-	.header_name_warp {
-		font-weight: 500;
-		font-size: 26rpx;
-		color: #222222;
-		margin-top: 10rpx;
-	}
+  .header_name_warp {
+    font-weight: 500;
+    font-size: 26rpx;
+    color: #222222;
+    margin-top: 10rpx;
+  }
 }
 
 .no_address {
-	background: #FFFFFF;
-	border-radius: 24rpx;
-	padding: 30rpx;
+  background: #ffffff;
+  border-radius: 24rpx;
+  padding: 30rpx;
 
-	.no_address_title {
-		display: flex;
-		align-items: center;
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #222222;
-	}
+  .no_address_title {
+    display: flex;
+    align-items: center;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #222222;
+  }
 
-	.no_address_msg {
-		font-weight: 500;
-		font-size: 26rpx;
-		color: #808080;
-		margin-top: 10rpx;
-	}
+  .no_address_msg {
+    font-weight: 500;
+    font-size: 26rpx;
+    color: #808080;
+    margin-top: 10rpx;
+  }
 }
 
-
 .order_store_warp {
-	margin-top: 30rpx;
-	background: #FFFFFF;
-	border-radius: 24rpx;
-	padding: 30rpx;
+  margin-top: 30rpx;
+  background: #ffffff;
+  border-radius: 24rpx;
+  padding: 30rpx;
 }
 
 .order_product_warp {
-	.order_product_header {
-		display: flex;
-	}
+  .order_product_header {
+    display: flex;
+  }
 
-	.order_product_title {
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #1A1A1A;
-		margin-left: 10rpx;
-	}
+  .order_product_title {
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #1a1a1a;
+    margin-left: 10rpx;
+  }
 
-	.shops_address_warp {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 20rpx;
-		background-color: #F5F5F5;
-		border-radius: 10rpx;
-		margin: 10rpx;
-		font-size: 26rpx;
+  .shops_address_warp {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx;
+    background-color: #f5f5f5;
+    border-radius: 10rpx;
+    margin: 10rpx;
+    font-size: 26rpx;
 
-		.shops_address_warp_title {
-			color: #222222;
-		}
-	}
+    .shops_address_warp_title {
+      color: #222222;
+    }
+  }
 
-	.order_item_content {
-		display: flex;
-		margin-top: 20rpx;
+  .order_item_content {
+    display: flex;
+    margin-top: 20rpx;
 
-		.content_info_right {
-			margin-left: 20rpx;
-			display: grid;
-			width: calc(100% - 160rpx);
-		}
+    .content_info_right {
+      margin-left: 20rpx;
+      display: grid;
+      width: calc(100% - 160rpx);
+    }
 
-		.content_info_left_total {}
+    .content_info_left_total {
+    }
 
-		.content_info_title {
-			width: 460rpx;
-		}
+    .content_info_title {
+      width: 460rpx;
+    }
 
-		.content_info_tag {
-			font-size: 20rpx;
-		}
+    .content_info_tag {
+      font-size: 20rpx;
+    }
 
-		.content_info_right_total {
-			display: flex;
-			justify-content: space-between;
-			padding: 0 20rpx 0 0;
-		}
+    .content_info_right_total {
+      display: flex;
+      justify-content: space-between;
+      padding: 0 20rpx 0 0;
+    }
 
-		.content_right_total {
-			font-weight: 500;
-			font-size: 22rpx;
-			color: $app-bt-bj;
-		}
-	}
+    .content_right_total {
+      font-weight: 500;
+      font-size: 22rpx;
+      color: $app-bt-bj;
+    }
+  }
 
-	.content_info_right_remark {
-		display: flex;
-		justify-content: space-between;
-		margin-top: 20rpx;
-		align-items: center;
+  .content_info_right_remark {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 20rpx;
+    align-items: center;
 
-		.title {
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #222222;
-		}
+    .title {
+      font-weight: 500;
+      font-size: 26rpx;
+      color: #222222;
+    }
 
-		::v-deep {
-			input {
-				text-align: right;
-			}
-		}
-	}
+    ::v-deep {
+      input {
+        text-align: right;
+      }
+    }
+  }
 }
 
 .order_freight_warp {
-	.order_freight_item {
-		display: flex;
-		justify-content: space-between;
-		font-weight: 500;
-		font-size: 26rpx;
-		color: #222222;
-		line-height: 60rpx;
+  .order_freight_item {
+    display: flex;
+    justify-content: space-between;
+    font-weight: 500;
+    font-size: 26rpx;
+    color: #222222;
+    line-height: 60rpx;
 
-		.value_ {
-			color: $app-bt-bj;
-		}
+    .value_ {
+      color: $app-bt-bj;
+    }
 
-		.coupon_ {
-			margin-left: 20rpx;
-			height: 32rpx;
-			border-radius: 5rpx;
-			border: 1px solid $app-bt-bj;
-			font-size: 20rpx;
-			color: $app-bt-bj;
-			padding: 0rpx 6rpx;
-		}
-	}
+    .coupon_ {
+      margin-left: 20rpx;
+      height: 32rpx;
+      border-radius: 5rpx;
+      border: 1px solid $app-bt-bj;
+      font-size: 20rpx;
+      color: $app-bt-bj;
+      padding: 0rpx 6rpx;
+    }
+  }
 }
 
-
 .order_pay_but {
-	position: fixed;
-	bottom: 0;
-	height: 144rpx;
-	background: #FFFFFF;
-	display: flex;
-	justify-content: space-between;
-	width: calc(100% - 34rpx);
-	padding-top: 20rpx;
-
-	._but {
-		padding: 20rpx 72rpx;
-		text-align: center;
-		background: $app-bt-bj;
-		border-radius: 16rpx 16rpx 16rpx 16rpx;
-		color: #FFF;
-		height: 46rpx;
-	}
-
-	.price_ {
-		font-weight: bold;
-		font-size: 36rpx;
-		color: $app-bt-bj;
-	}
+  position: fixed;
+  bottom: 0;
+  height: 144rpx;
+  background: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  width: calc(100% - 34rpx);
+  padding-top: 20rpx;
 
+  ._but {
+    padding: 20rpx 72rpx;
+    text-align: center;
+    background: $app-bt-bj;
+    border-radius: 16rpx 16rpx 16rpx 16rpx;
+    color: #fff;
+    height: 46rpx;
+  }
 
+  .price_ {
+    font-weight: bold;
+    font-size: 36rpx;
+    color: $app-bt-bj;
+  }
 }
 </style>
diff --git a/pages/other_package/productInfo/productInfo.vue b/pages/other_package/productInfo/productInfo.vue
index 619c612..aba3d5d 100644
--- a/pages/other_package/productInfo/productInfo.vue
+++ b/pages/other_package/productInfo/productInfo.vue
@@ -803,7 +803,7 @@ export default {
         uni.navigateTo({
           url: `/pages/order_package/order_submit/order_submit?sed=${JSON.stringify(
             params
-          )}`,
+          )}&address=${this.selectAddress?.id}`,
         });
         return;
       }
@@ -811,7 +811,7 @@ export default {
       if (resp && resp.bizcode === 100) {
         if (isBy) {
           uni.navigateTo({
-            url: `/pages/order_package/order_submit/order_submit?ids=${resp.data}`,
+            url: `/pages/order_package/order_submit/order_submit?ids=${resp.data}&address=${this.selectAddress?.id}`,
           });
         } else {
           this.specificationShow = false;
diff --git a/static/shopping/tp.png b/static/shopping/tp.png
new file mode 100644
index 0000000000000000000000000000000000000000..aafea78e4b53e4bc81794cce9386def513b18c30
GIT binary patch
literal 5891
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
Z0|48jx!%ZST<rh=002ovPDHLkV1j3Ochmp?

literal 0
HcmV?d00001

diff --git a/utils/config.js b/utils/config.js
index c78487b..7e63461 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -2,9 +2,9 @@
 // export const BASE_URL="https://frontend.jdns360.com/api"; // 正式环境
 // export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
 
-// export const BASE_URL = "https://api.tbmall.xin"; //生产
+export const BASE_URL = "https://api.tbmall.xin"; //生产
 // export const BASE_URL ='http://api.hm.a-d.work:6880' // 测试
-export const BASE_URL ='http://api.outer.tbmall.xin:6880' // 本地测试
+// export const BASE_URL ='http://api.outer.tbmall.xin:6880' // 本地测试