From bada114ab2c2ab087e551d8ff5e99182c2be67a3 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 10 Nov 2023 11:35:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cart/cart.vue        | 91 ++++++++++++++++-----------------
 pages/plugins/ask/form/form.vue |  2 +-
 2 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 4e570640..998c4b85 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -1,7 +1,7 @@
 <template>
     <view :class="theme_view">
         <scroll-view :scroll-y="true" class="scroll-box" :class="data_list.length > 0 ? 'cart' : ''" @scrolltolower="scroll_lower" lower-threshold="60">
-            <view class="content">
+            <view class="content">
                 <view v-if="data_list.length > 0" class="cart-page">
                     <!-- 数据列表 -->
                     <view class="padding-horizontal-main padding-top-main" :class="source_type != 'cart' ? 'bottom-line-exclude' : ''">
@@ -86,47 +86,46 @@
                     </div>
                 </view>
                 <!-- 结尾 -->
-                <component-bottom-line :propStatus="goods_bottom_line_status"></component-bottom-line>
-            </view>
-
-            <!-- 操作导航 -->
-            <!-- 展示型 -->
-            <block v-if="data_list.length > 0">
-                <view v-if="common_site_type == 1" :class="'cart-buy-nav oh wh-auto ' + (source_type != 'cart' ? 'bottom-line-exclude' : '')">
-                    <view class="cart-exhibition-mode padding-horizontal-main">
-                        <button class="bg-main cr-white round wh-auto text-size-sm" type="default" @tap="exhibition_submit_event" hover-class="none">
-                            <view class="dis-inline-block va-m margin-right-xl">
-                                <uni-icons type="phone" size="14" color="#fff" />
-                            </view>
-                            <text class="va-m">{{ common_is_exhibition_mode_btn_text }}</text>
-                        </button>
-                    </view>
-                </view>
-                <!-- 销售,自提,虚拟销售 -->
-                <view v-else class="flex-row jc-sb align-c cart-buy-nav oh wh-auto br-t bg-white" :class="source_type != 'cart' ? 'bottom-line-exclude' : ''">
-                    <view class="cart-nav-base single-text padding-left flex-row jc-sb align-c">
-                        <view class="cart-selected flex-row align-c">
-                            <view @tap="selected_event" data-type="all">
-                                <iconfont :name="'icon-zhifu-' + (is_selected_all ? 'yixuan' : 'weixuan')" size="34rpx" :color="is_selected_all ? theme_color : '#999'"></iconfont>
-                            </view>
-                            <text v-if="already_selected_status" @tap="cart_all_remove_event" class="margin-left-main cart-nav-remove-submit dis-inline-block va-m bg-white cr-red br-red round cp">删除</text>
-                            <text v-else class="va-m cr-base padding-left-main" @tap="selected_event" data-type="all">全选</text>
-                        </view>
-                        <view class="price flex-row jc-e flex-nowrap align-c">
-                            <view>合计：</view>
-                            <view class="sales-price single-text fw-b">
-                                <text class="text-size-sm">{{ currency_symbol }}</text>
-                                <text class="text-size-lg">{{ total_price }}</text>
-                            </view>
-                        </view>
-                    </view>
-                    <view class="cart-nav-submit">
-                        <button class="bg-main cr-white round" type="default" @tap="buy_submit_event" :disabled="!already_valid_selected_status" hover-class="none">
-                            去结算
-                            <text v-if="total_num > 0">({{ total_num }})</text>
-                        </button>
-                    </view>
-                </view>
+                <component-bottom-line :propStatus="goods_bottom_line_status"></component-bottom-line>
+            </view>
+
+            <!-- 操作导航 -->
+            <!-- 展示型 -->
+            <block v-if="data_list.length > 0">
+                <view v-if="common_site_type == 1" :class="'cart-buy-nav oh wh-auto ' + (source_type != 'cart' ? 'bottom-line-exclude' : '')">
+                    <view class="cart-exhibition-mode padding-horizontal-main">
+                        <button class="bg-main cr-white round wh-auto text-size-sm" type="default" @tap="exhibition_submit_event" hover-class="none">
+                            <view class="dis-inline-block va-m margin-right-xl">
+                                <uni-icons type="phone" size="14" color="#fff" />
+                            </view>
+                            <text class="va-m">{{ common_is_exhibition_mode_btn_text }}</text>
+                        </button>
+                    </view>
+                </view>
+                <!-- 销售,自提,虚拟销售 -->
+                <view v-else class="flex-row jc-sb align-c cart-buy-nav oh wh-auto br-t bg-white" :class="source_type != 'cart' ? 'bottom-line-exclude' : ''">
+                    <view class="cart-nav-base single-text padding-left flex-row jc-sb align-c">
+                        <view class="cart-selected flex-row align-c">
+                            <view @tap="selected_event" data-type="all">
+                                <iconfont :name="'icon-zhifu-' + (is_selected_all ? 'yixuan' : 'weixuan')" size="34rpx" :color="is_selected_all ? theme_color : '#999'"></iconfont>
+                            </view>
+                            <text v-if="already_selected_status" @tap="cart_all_remove_event" class="margin-left-main cart-nav-remove-submit dis-inline-block va-m bg-white cr-red br-red round cp">删除</text>
+                            <text v-else class="va-m cr-base padding-left-main" @tap="selected_event" data-type="all">全选</text>
+                        </view>
+                        <view class="price flex-row jc-e flex-nowrap align-c">
+                            <view>合计：</view>
+                            <view class="sales-price single-text fw-b">
+                                <text class="text-size-sm">{{ currency_symbol }}</text>
+                                <text class="text-size-lg">{{ total_price }}</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="cart-nav-submit">
+                        <button class="bg-main cr-white round" type="default" @tap="buy_submit_event" :disabled="!already_valid_selected_status" hover-class="none">
+                            去结算<block v-if="total_num > 0">({{ total_num }})</block>
+                        </button>
+                    </view>
+                </view>
             </block>
         </scroll-view>
 
@@ -851,11 +850,11 @@
     .cart-page {
         margin-bottom: 40rpx;
     }
-    .scroll-box {
+    .scroll-box {
         height: 100vh;
-    }
-    .scroll-box.cart .content {
-        padding-bottom: 125rpx;
+    }
+    .scroll-box.cart .content {
+        padding-bottom: 125rpx;
     }
 
     .cart-goods-title {
diff --git a/pages/plugins/ask/form/form.vue b/pages/plugins/ask/form/form.vue
index 985651bb..dffdd649 100644
--- a/pages/plugins/ask/form/form.vue
+++ b/pages/plugins/ask/form/form.vue
@@ -6,7 +6,7 @@
                     <textarea class="cr-base textarea-height" name="content" maxlength="230" auto-height placeholder-class="cr-grey-9" placeholder="请详细描述问题，我们将尽快为您解答！" @input="text_input_event"></textarea>
                     <view class="tr text-size-xs cr-grey-c">{{ text_num }}/500</view>
                     <view class="spacing-mt dis-none">
-                        <view class="margin-bottom-main">添加图片(0/3)</view>
+                        <view class="margin-bottom-main">添加图片({{ image_list.length }}/3)</view>
                         <component-upload :propData="image_list" :prop-path-type="editor_path_type" @call-back="retrun_image_event"></component-upload>
                     </view>
                     <view class="tr margin-top-sm">