diff --git a/App.vue b/App.vue
index 2f204a43..531b0c29 100644
--- a/App.vue
+++ b/App.vue
@@ -67,11 +67,11 @@ export default {
             // tabbar页面
             tabbar_pages: ["/pages/index/index", "/pages/goods-category/goods-category", "/pages/cart/cart", "/pages/user/user"],
             // 请求地址
-            // request_url: 'https://d1.shopxo.vip/',
-            request_url: "http://shopxo.com/",
+            request_url: "https://d1.shopxo.vip/",
+            // request_url: "http://shopxo.com/",
             // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-            // static_url: 'https://d1.shopxo.vip/',
-            static_url: "http://shopxo.com/",
+            static_url: "https://d1.shopxo.vip/",
+            // static_url: "http://shopxo.com/",
             // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
             system_type: "default",
             // 基础信息
diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index bc89a27e..2e874252 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -59,44 +59,6 @@
                         </view>
                     </uni-swipe-action>
                 </view>
-
-                <!-- 操作导航 -->
-                <!-- 展示型 -->
-                <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">
-                                <image class="icon va-m" :src="common_static_url + 'select' + (is_selected_all ? '-active' : '') + '-icon.png'" mode="widthFix"></image>
-                            </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>
             </view>
 
             <!-- 空购物车 -->
@@ -134,6 +96,45 @@
             <!-- 结尾 -->
             <component-bottom-line :propStatus="goods_bottom_line_status"></component-bottom-line>
         </scroll-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">
+                            <image class="icon va-m" :src="common_static_url + 'select' + (is_selected_all ? '-active' : '') + '-icon.png'" mode="widthFix"></image>
+                        </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>
+        </block>
     </view>
 </template>
 <script>
@@ -289,7 +290,7 @@ export default {
         },
 
         // 获取数据
-        get_data() {
+        get_data(type) {
             uni.request({
                 url: app.globalData.get_request_url("index", "cart"),
                 method: "POST",
@@ -314,14 +315,18 @@ export default {
                         let new_goods_list = [];
                         // 判断猜你喜欢是否含有数据
                         if (this.goods_list.length > 0) {
-                            new_goods_list = this.goods_change(data_list, 0, true);
+                            if (type !== 1) {
+                                new_goods_list = this.goods_change(data_list);
+                                this.setData({
+                                    goods_list: new_goods_list,
+                                });
+                            }
                         }
                         // 设置数据
                         this.setData({
                             data_list: data_list,
                             data_list_loding_status: data_list.length == 0 ? 0 : 3,
                             data_list_loding_msg: "购物车空空如也",
-                            goods_list: new_goods_list,
                         });
                         // 选择处理
                         this.cart_selected_calculate();
@@ -373,6 +378,20 @@ export default {
             var buy_number = type == 0 ? temp_number - 1 : temp_number + 1;
             this.goods_buy_number_func(index, buy_number, type);
         },
+        // 删除弹窗
+        model_tips(id) {
+            uni.showModal({
+                title: "温馨提示",
+                content: "挑了这么久，真的要删除吗？",
+                confirmText: "确认",
+                cancelText: "暂不",
+                success: (result) => {
+                    if (result.confirm) {
+                        this.cart_delete(id, "delete");
+                    }
+                },
+            });
+        },
 
         // 数量处理方法
         goods_buy_number_func(index, buy_number, type) {
@@ -384,8 +403,10 @@ export default {
             let new_type = type === 0 ? "del" : "add";
             if (buy_number < buy_min_number) {
                 buy_number = buy_min_number;
+                this.data_list[index].stock = buy_min_number;
                 if (buy_min_number > 1) {
                     app.globalData.showToast("起购" + buy_min_number + inventory_unit);
+                    this.model_tips(temp_data_list[index]["id"]);
                     return false;
                 }
             }
@@ -403,6 +424,7 @@ export default {
             }
 
             if (temp_data_list[index]["stock"] == 1 && buy_number == 1) {
+                this.model_tips(temp_data_list[index]["id"]);
                 return false;
             }
 
@@ -431,7 +453,7 @@ export default {
                         temp_data_list[index]["selected"] = true;
                         delete not_use[temp_data_list[index]["id"]];
 
-                        let new_goods_list = this.goods_change(temp_data_list, buy_number);
+                        let new_goods_list = this.goods_change(temp_data_list);
                         this.setData({
                             data_list: temp_data_list,
                             goods_list: new_goods_list,
@@ -532,8 +554,8 @@ export default {
 
             // 根据操作类型处理数据
             var id = temp_data_list[this.swipe_item_index]["id"];
+            var goods_id = temp_data_list[this.swipe_item_index]["goods_id"];
             if (index == 0) {
-                var goods_id = temp_data_list[this.swipe_item_index]["goods_id"];
                 this.goods_favor_delete(id, goods_id, "favor");
             } else {
                 this.cart_delete(id, "delete");
@@ -559,7 +581,7 @@ export default {
                                 temp_list.push(temp_data_list[i]);
                             }
                         }
-                        let new_goods_list = this.goods_change(temp_data_list);
+                        let new_goods_list = this.goods_change(temp_list);
                         this.setData({
                             data_list: temp_list,
                             data_list_loding_status: temp_list.length == 0 ? 0 : this.data_list_loding_status,
@@ -786,33 +808,56 @@ export default {
                 },
             });
         },
+
         // 猜你喜欢加入购物车回调
         cart_success_event() {
-            this.get_data();
+            // 传1表示为购物车回调方法调用的此方法
+            this.get_data(1);
         },
+
         // 猜你喜欢数据更新
-        // shop_list: 购物车数据； is_init:判断是否是初始化数据，如果是则buy_number参数不生效； buy_number: 购买数量 不传默认为全部删除
-        goods_change(shop_list, buy_number, is_init) {
+        // cart_list: 购物车数据；
+        goods_change(cart_list) {
             // 更新猜你喜欢的数据
             let new_goods_list = this.goods_list;
-            let init = is_init || false;
-            let new_buy_number = buy_number || 0;
             for (let i = 0; i < new_goods_list.length; i++) {
-                let bool = app.globalData.some_arry(shop_list, new_goods_list[i].id, "goods_id");
+                let bool = app.globalData.some_arry(cart_list, new_goods_list[i].id, "goods_id");
                 if (bool) {
-                    if (is_init) {
-                        for (let j = 0; j < shop_list.length; j++) {
-                            if (shop_list[j].goods_id === new_goods_list[i].id) {
-                                new_goods_list[i].user_cart_count = shop_list[j].stock;
-                            }
+                    // 将购物车中相同商品不同规格的商品数量累加
+                    let new_goods_item = this.cart_item_num(cart_list);
+                    for (let j = 0; j < new_goods_item.length; j++) {
+                        if (new_goods_list[i].id === new_goods_item[j].id) {
+                            new_goods_list[i].user_cart_count = new_goods_item[j].num;
                         }
-                    } else {
-                        new_goods_list[i].user_cart_count = new_buy_number;
                     }
+                } else {
+                    new_goods_list[i].user_cart_count = 0;
                 }
             }
             return new_goods_list;
         },
+
+        // 商品数量去重累加数量
+        cart_item_num(cart_list) {
+            let _res = [];
+            for (let i = 0; i < cart_list.length; ) {
+                let num = 0;
+                let count = 0;
+                for (let j = i; j < cart_list.length; j++) {
+                    if (cart_list[i].goods_id == cart_list[j].goods_id) {
+                        num += Number(cart_list[j].stock ? cart_list[j].stock : 0);
+                        count++;
+                    }
+                }
+                let obj = {
+                    id: cart_list[i].goods_id,
+                    num: num,
+                };
+                _res.push(obj);
+                i += count;
+            }
+            return _res;
+        },
     },
 };
 </script>
@@ -821,10 +866,16 @@ export default {
     * 商品列表
     */
 .scroll-box.active {
+    height: calc(100vh - 125rpx);
+    /* 125rpx */
+    /* #ifdef H5 */
     height: calc(100vh - 224rpx);
+    /* #endif */
 }
 .scroll-box {
+    /* #ifdef H5 */
     height: calc(100vh - 100rpx);
+    /* #endif */
 }
 
 .cart-goods-title {
@@ -912,7 +963,7 @@ export default {
     position: fixed;
     z-index: 2;
     left: 0;
-    bottom: 0;
+    bottom: 0rpx;
     /* #ifdef H5 || APP */
     bottom: var(--window-bottom);
     /* #endif */
diff --git a/components/icon-nav/icon-nav.vue b/components/icon-nav/icon-nav.vue
index 68e3a85c..7d32c0c4 100644
--- a/components/icon-nav/icon-nav.vue
+++ b/components/icon-nav/icon-nav.vue
@@ -1,6 +1,6 @@
 <template>
     <view>
-        <view v-if="propData.length > 0" class="icon-nav-list" :class="propData.length > 5 ? 'swiper-height-max' : 'swiper-height-min'">
+        <view v-if="propData.length > 0" class="icon-nav-list spacing-mb" :class="propData.length > 5 ? 'swiper-height-max' : 'swiper-height-min'">
             <uni-swiper-dot class="uni-swiper-dot-box" mode="default" :dots-styles="dotsStyles" @clickItem="click_item" :info="swiperData" :current="current">
                 <swiper class="swiper-box" :autoplay="autoplay" :duration="duration" @change="swiper_change" :current="swiperDotIndex">
                     <swiper-item v-for="(swiperItemData, i) in swiperData" :key="i">
@@ -66,7 +66,6 @@ export default {
 <style scoped>
 .icon-nav-list {
     overflow: hidden;
-    margin-bottom: 20rpx;
     padding: 20rpx;
 }
 
diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index 2ae9791c..5511998b 100644
--- a/components/popup/popup.vue
+++ b/components/popup/popup.vue
@@ -1,179 +1,182 @@
 <template>
-	<view>
-		<view :class="'popup ' + (propClassname || '') + ' ' + (propShow ? 'popup-show' : '') + ' ' + (propAnimation ? 'animation': '' )" :disable-scroll="propDisablescroll">
-			<view class="popup-mask" :style="'z-index: '+propIndex+';'" v-if="propMask" @tap="on_mask_tap"></view>
-			<view :class="'popup-content bottom-line-exclude popup-' + (propPosition || 'bottom')+ ' '+(propIsBar ? 'popup-bar' : '')"
-				:style="[{left: popup_content_left_value + 'px'},{top: propShow ? propTop : ''},{bottom: propShow ? propBottom : ''}]">
-				<slot></slot>
-			</view>
-		</view>
-	</view>
+    <view>
+        <view :class="'popup ' + (propClassname || '') + ' ' + (propShow ? 'popup-show' : '') + ' ' + (propAnimation ? 'animation' : '')" :disable-scroll="propDisablescroll">
+            <view class="popup-mask" :style="'z-index: ' + propIndex + ';'" v-if="propMask" @tap="on_mask_tap"></view>
+            <view :class="'popup-content bottom-line-exclude popup-' + (propPosition || 'bottom') + ' ' + (propIsBar ? 'popup-bar' : '')" :style="[{ left: popup_content_left_value + 'px' }, { top: propShow ? propTop : '' }, { bottom: propShow ? propBottom : '' }]">
+                <slot></slot>
+            </view>
+        </view>
+    </view>
 </template>
 <script>
-	export default {
-		data() {
-			return {
-				popup_content_left_value: 'auto'
-			};
-		},
-		components: {},
-		props: {
-			propClassname: {
-				type: String,
-				default: ''
-			},
-			propShow: {
-				type: Boolean,
-				default: false
-			},
-			propPosition: {
-				type: String,
-				default: 'bottom'
-			},
-			propMask: {
-				type: Boolean,
-				default: true
-			},
-			propAnimation: {
-				type: Boolean,
-				default: true
-			},
-			propDisablescroll: {
-				type: Boolean,
-				default: false
-			},
-			propIsBar: {
-				type: Boolean,
-				default: false
-			},
-			propIndex: {
-				type: Number,
-				default: 100
-			},
-			// 需要携带后缀
-			propTop: {
-				type: String,
-				default: ''
-			},
-			propBottom: {
-				type: String,
-				default: ''
-			}
-		},
-		// 属性值改变监听
-		watch: {
-			// 监听状态
-			propShow(value, old_value) {
-				this.left_handle();
-			}
-		},
-		// 组建创建
-		created: function() {
-			this.left_handle();
-		},
-		methods: {
-			// 事件处理
-			on_mask_tap: function on_mask_tap() {
-				this.$emit('onclose', {
-					detail: {}
-				}, {});
-			},
-			// 左边距位置处理
-			left_handle() {
-				// 处理内容左边距、避免父级设置内边距影响
-				var width = uni.getSystemInfoSync().windowWidth;
-				var left = 0;
-				if (width > 800) {
-					left = (width - 800) / 2;
-				}
-				this.popup_content_left_value = left;
-			}
-		}
-	};
+export default {
+    data() {
+        return {
+            popup_content_left_value: "auto",
+        };
+    },
+    components: {},
+    props: {
+        propClassname: {
+            type: String,
+            default: "",
+        },
+        propShow: {
+            type: Boolean,
+            default: false,
+        },
+        propPosition: {
+            type: String,
+            default: "bottom",
+        },
+        propMask: {
+            type: Boolean,
+            default: true,
+        },
+        propAnimation: {
+            type: Boolean,
+            default: true,
+        },
+        propDisablescroll: {
+            type: Boolean,
+            default: false,
+        },
+        propIsBar: {
+            type: Boolean,
+            default: false,
+        },
+        propIndex: {
+            type: Number,
+            default: 100,
+        },
+        // 需要携带后缀
+        propTop: {
+            type: String,
+            default: "",
+        },
+        propBottom: {
+            type: String,
+            default: "",
+        },
+    },
+    // 属性值改变监听
+    watch: {
+        // 监听状态
+        propShow(value, old_value) {
+            this.left_handle();
+        },
+    },
+    // 组建创建
+    created: function () {
+        this.left_handle();
+    },
+    methods: {
+        // 事件处理
+        on_mask_tap: function on_mask_tap() {
+            this.$emit(
+                "onclose",
+                {
+                    detail: {},
+                },
+                {}
+            );
+        },
+        // 左边距位置处理
+        left_handle() {
+            // 处理内容左边距、避免父级设置内边距影响
+            var width = uni.getSystemInfoSync().windowWidth;
+            var left = 0;
+            if (width > 800) {
+                left = (width - 800) / 2;
+            }
+            this.popup_content_left_value = left;
+        },
+    },
+};
 </script>
 <style>
-	.popup-content {
-		position: fixed;
-		background: #fff;
-		z-index: 101;
-		overflow: hidden;
-	}
+.popup-content {
+    position: fixed;
+    background: #fff;
+    z-index: 101;
+    overflow: hidden;
+}
 
-	.popup-mask {
-		position: fixed;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		background-color: rgba(0, 0, 0, 0.6);
-		opacity: 0;
-		pointer-events: none;
-		z-index: 100;
-	}
+.popup-mask {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: rgba(0, 0, 0, 0.6);
+    opacity: 0;
+    pointer-events: none;
+    z-index: 100;
+}
 
-	.popup-left {
-		transform: translateX(-100%);
-		left: 0;
-		top: 0;
-		bottom: 0;
-	}
+.popup-left {
+    transform: translateX(-100%);
+    left: 0;
+    top: 0;
+    bottom: 0;
+}
 
-	.popup-right {
-		transform: translateX(100%);
-		right: 0;
-		top: 0;
-		bottom: 0;
-	}
+.popup-right {
+    transform: translateX(100%);
+    right: 0;
+    top: 0;
+    bottom: 0;
+}
 
-	.popup-top {
-		top: 0;
-		width: 100vw;
-		transform: translateY(-100%);
-	}
+.popup-top {
+    top: 0;
+    width: 100vw;
+    transform: translateY(-100%);
+}
 
-	.popup-bottom {
-		bottom: var(--window-bottom);
-		width: 100vw;
-		transform: translateY(100%);
-	}
+.popup-bottom {
+    bottom: var(--window-bottom);
+    width: 100vw;
+    transform: translateY(100%);
+}
 
-	.popup-show .popup-content {
-		transform: none;
-	}
+.popup-show .popup-content {
+    transform: none;
+}
 
-	.popup-show .popup-mask {
-		opacity: 1;
-		pointer-events: auto;
-	}
+.popup-show .popup-mask {
+    opacity: 1;
+    pointer-events: auto;
+}
 
-	.popup.animation .popup-mask,
-	.popup.animation .popup-content {
-		transition: all 0.35s linear;
-	}
+.popup.animation .popup-mask,
+.popup.animation .popup-content {
+    transition: all 0.35s linear;
+}
 
-	.popup-top {
-		border-bottom-right-radius: 20rpx;
-		border-bottom-left-radius: 20rpx;
-	}
+.popup-top {
+    border-bottom-right-radius: 20rpx;
+    border-bottom-left-radius: 20rpx;
+}
 
-	.popup-bottom {
-		border-top-right-radius: 20rpx;
-		border-top-left-radius: 20rpx;
-	}
+.popup-bottom {
+    border-top-right-radius: 20rpx;
+    border-top-left-radius: 20rpx;
+}
 
-	.popup-left {
-		border-top-right-radius: 20rpx;
-		border-bottom-right-radius: 20rpx;
-	}
+.popup-left {
+    border-top-right-radius: 20rpx;
+    border-bottom-right-radius: 20rpx;
+}
 
-	.popup-right {
-		border-top-left-radius: 20rpx;
-		border-bottom-left-radius: 20rpx;
-	}
+.popup-right {
+    border-top-left-radius: 20rpx;
+    border-bottom-left-radius: 20rpx;
+}
 
-	.popup-bar {
-		/* #ifdef H5 || APP */
-		bottom: var(--window-bottom) !important;
-		/* #endif */
-	}
-</style>
\ No newline at end of file
+.popup-bar {
+    /* #ifdef H5 || APP */
+    bottom: var(--window-bottom) !important;
+    /* #endif */
+}
+</style>
diff --git a/pages.json b/pages.json
index 45e1d323..437f22e3 100644
--- a/pages.json
+++ b/pages.json
@@ -31,7 +31,7 @@
                 "titlePenetrate": "YES",
                 "navigationBarTitleText": "",
                 // #endif
-                "enablePullDownRefresh": true
+                "enablePullDownRefresh": false
             }
         },
         {
diff --git a/pages/goods-category/goods-category.css b/pages/goods-category/goods-category.css
index 0c6b4eb6..4241a366 100644
--- a/pages/goods-category/goods-category.css
+++ b/pages/goods-category/goods-category.css
@@ -2,13 +2,15 @@
  * 头部背景
  */
 .goods-top-bg {
-    height: 280rpx;
+    height: 286rpx;
+    background-color: #f5f5f5;
 }
 
 .goods-top-search-bg {
-    height: 138rpx;
-    /* #ifdef H5 || APP */
-    height: 98rpx;
+    background-color: red;
+    height: 144rpx;
+    /* #ifdef H5 */
+    height: 104rpx !important;
     /* #endif */
 }
 
@@ -23,14 +25,24 @@
     /* #ifdef H5 || MP-TOUTIAO || APP */
     padding-right: 20rpx;
     /* #endif */
-    padding-bottom: 10px;
+    /* #ifdef H5 */
+    padding-top: 20rpx !important;
+    /* #endif */
+    padding-bottom: 20rpx;
+    height: 64rpx;
     z-index: 101;
 }
 
 .category-content {
-    height: calc(100vh - 68px);
+    height: calc(100vh - 142rpx);
     /* #ifdef H5 || APP */
-    height: calc(100vh - 99px) !important;
+    height: calc(100vh - 210rpx) !important;
+    /* #endif */
+}
+
+.nav-more-top {
+    /* #ifdef H5 || APP */
+    top: 135rpx !important;
     /* #endif */
 }
 
@@ -302,7 +314,7 @@
     width: calc(100% - 40rpx);
     left: auto;
     bottom: 20rpx;
-    z-index: 6;
+    z-index: 2;
     max-width: calc(800px - 40rpx);
     margin-left: 20rpx;
     background: linear-gradient(132deg, #EBEBEB 0%, #F7F7F7 100%);
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 08b2d4ed..06448699 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -6,7 +6,7 @@
             </view>
             <!-- 搜索框 -->
             <block v-if="is_single_page == 0">
-                <view class="nav-search padding-horizontal-main pr" :style="'padding-top:' + (status_bar_height + 8) + 'px;'">
+                <view class="nav-search padding-horizontal-main pr" :style="'padding-top:' + (status_bar_height + 5) + 'px;'">
                     <view class="goods-top-search-bg pa top-0 left-0 right-0 wh-auto">
                         <image :src="theme_static_url + 'goods-top-bg.png'" mode="top" class="wh-auto ht-auto"></image>
                     </view>
@@ -20,7 +20,7 @@
             </block>
 
             <!-- 分类内容 -->
-            <view v-if="category_list.length > 0" :class="'category-content bs-bb pr ' + (category_show_level == 0 ? 'goods-model' : '')" :style="'height:calc(100vh - ' + (status_bar_height + 48) + 'px);'">
+            <view v-if="category_list.length > 0" :class="'category-content bs-bb pr bg-green ' + (category_show_level == 0 ? 'goods-model' : '')" :style="'height:calc(100vh - ' + (status_bar_height + 45) + 'px);'">
                 <block v-if="category_show_level == 1">
                     <!-- 一级模式 -->
                     <scroll-view scroll-y class="ht-auto">
@@ -54,7 +54,7 @@
                                     </view>
                                 </block>
                             </scroll-view>
-                            <component-nav-more :prop-top="popup_top" :prop-status="popup_status" @open-popup="open_popup_event">
+                            <component-nav-more class="nav-more-top" :prop-top="status_bar_height + 247 + 'px'" :prop-status="popup_status" @open-popup="open_popup_event">
                                 <view class="nav-list-more">
                                     <view class="flex-row flex-warp align-c">
                                         <block v-for="(item, index) in category_list" :key="index">
@@ -338,7 +338,7 @@
                     </view>
                 </block>
                 <!-- 购物车底部导航 -->
-                <view class="botton-nav round pa oh flex-row jc-sb align-c">
+                <view class="botton-nav round pa oh flex-row jc-sb align-c z-i">
                     <view class="flex-row align-c flex-1 flex-width">
                         <view class="cart pr cp top-sm" @tap="cart_event">
                             <iconfont name="icon-applet-shop-acquiesce" size="36rpx" color="#fff"></iconfont>
@@ -440,7 +440,6 @@ export default {
             plugins_label_data: null,
             theme_color: app.globalData.get_theme_color(),
             popup_status: false,
-            popup_top: "138rpx",
         };
     },
 
@@ -478,11 +477,6 @@ export default {
             this.$refs.user_base.init("goods-category");
         }
     },
-
-    // 下拉刷新
-    onPullDownRefresh() {
-        this.init();
-    },
     created() {
         // #ifdef H5 || APP
         this.popup_top = "98rpx";
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d160403c..c0b36131 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,645 +1,616 @@
 <template>
-	<view>
-		<view :class="(plugins_mourning_data_is_app ? ' grayscale' : '')+(is_single_page == 1 ? ' single-page-top' : '')">
-			<!-- 顶部内容 -->
-			<view v-if="load_status == 1" class="home-top-nav-content" :style="banner_list.length > 0 ? slider_bg : top_content_style">
-				<!-- logo/标题 -->
-				<!-- #ifndef MP-TOUTIAO -->
-				<view class="home-top-nav-logo">
-					<block v-if="is_logo_use_text == 0 && (application_logo || null) != null">
-						<image :src="application_logo" mode="heightFix" class="home-top-nav-logo-image"></image>
-					</block>
-					<block v-else>
-						<view class="home-top-nav-logo-title cr-white single-text">{{application_title}}</view>
-					</block>
-				</view>
-				<!-- #endif -->
+    <view>
+        <view :class="(plugins_mourning_data_is_app ? ' grayscale' : '') + (is_single_page == 1 ? ' single-page-top' : '')">
+            <!-- 顶部内容 -->
+            <view v-if="load_status == 1" class="home-top-nav-content" :style="banner_list.length > 0 ? slider_bg : top_content_style">
+                <!-- logo/标题 -->
+                <!-- #ifndef MP-TOUTIAO -->
+                <view class="home-top-nav-logo">
+                    <block v-if="is_logo_use_text == 0 && (application_logo || null) != null">
+                        <image :src="application_logo" mode="heightFix" class="home-top-nav-logo-image"></image>
+                    </block>
+                    <block v-else>
+                        <view class="home-top-nav-logo-title cr-white single-text">{{ application_title }}</view>
+                    </block>
+                </view>
+                <!-- #endif -->
 
-				<!-- 搜索 -->
-				<view v-if="search_is_fixed == 1" class="search-fixed-seat"></view>
-				<view v-if="load_status == 1" :class="'pr '+(search_is_fixed == 1 ? 'search-content-fixed bg-main' : '')" :style="search_is_fixed == 1 ? top_content_style : ''">
-					<view v-if="common_app_is_enable_search == 1" :style="search_style">
-						<view class="margin-horizontal-main">
-							<component-search propPlaceholder="输入商品名称搜索" :propIsBtn="true" propBgColor="#fff"></component-search>
-						</view>
-					</view>
+                <!-- 搜索 -->
+                <view v-if="search_is_fixed == 1" class="search-fixed-seat"></view>
+                <view v-if="load_status == 1" :class="'pr ' + (search_is_fixed == 1 ? 'search-content-fixed bg-main' : '')" :style="search_is_fixed == 1 ? top_content_style : ''">
+                    <view v-if="common_app_is_enable_search == 1" :style="search_style">
+                        <view class="margin-horizontal-main">
+                            <component-search propPlaceholder="输入商品名称搜索" :propIsBtn="true" propBgColor="#fff"></component-search>
+                        </view>
+                    </view>
 
-					<!-- #ifdef H5 || MP-TOUTIAO || APP -->
-					<!-- 右上角icon列表 -->
-					<view v-if="(right_icon_list || null) != null && right_icon_list.length > 0" class="nav-top-right-icon pa">
-						<block v-for="(item,index) in right_icon_list">
-							<view class="item dis-inline-block cp" :data-value="item.url || ''" @tap="url_event">
-								<uni-icons :type="item.icon" size="32rpx" color="#f1f1f1"></uni-icons>
-								<view v-if="(item.badge || null) != null" class="badge-icon pa">
-									<component-badge :propNumber="item.badge"></component-badge>
-								</view>
-							</view>
-						</block>
-					</view>
-					<!-- #endif -->
-				</view>
+                    <!-- #ifdef H5 || MP-TOUTIAO || APP -->
+                    <!-- 右上角icon列表 -->
+                    <view v-if="(right_icon_list || null) != null && right_icon_list.length > 0" class="nav-top-right-icon pa">
+                        <block v-for="(item, index) in right_icon_list">
+                            <view class="item dis-inline-block cp" :data-value="item.url || ''" @tap="url_event">
+                                <uni-icons :type="item.icon" size="32rpx" color="#f1f1f1"></uni-icons>
+                                <view v-if="(item.badge || null) != null" class="badge-icon pa">
+                                    <component-badge :propNumber="item.badge"></component-badge>
+                                </view>
+                            </view>
+                        </block>
+                    </view>
+                    <!-- #endif -->
+                </view>
 
-				<!-- 轮播 -->
-				<view class="banner-content padding-horizontal-main" v-if="banner_list.length > 0">
-					<component-banner :propData="banner_list" @changeBanner="changeBanner"></component-banner>
-				</view>
-				<!-- 导航 -->
-				<view v-if="navigation.length > 0">
-					<view class="padding-horizontal-main">
-						<view class="bg-white border-radius-main">
-							<component-icon-nav :propData="navigation"></component-icon-nav>
-						</view>
-					</view>
-				</view>
-			</view>
+                <!-- 轮播 -->
+                <view class="banner-content padding-horizontal-main" v-if="banner_list.length > 0">
+                    <component-banner :propData="banner_list" @changeBanner="changeBanner"></component-banner>
+                </view>
+                <!-- 导航 -->
+                <view v-if="navigation.length > 0">
+                    <view class="padding-horizontal-main">
+                        <view class="bg-white border-radius-main">
+                            <component-icon-nav :propData="navigation"></component-icon-nav>
+                        </view>
+                    </view>
+                </view>
+            </view>
 
-			<!-- 内容 -->
-			<view class="content padding-horizontal-main">
+            <!-- 内容 -->
+            <view class="content padding-horizontal-main">
+                <!-- 商城公告 -->
+                <component-notice v-if="load_status == 1 && (common_shop_notice || null) != null" :propData="common_shop_notice"></component-notice>
 
-				<!-- 商城公告 -->
-				<component-notice v-if="load_status == 1 && (common_shop_notice || null) != null" :propData="common_shop_notice"></component-notice>
+                <!-- 推荐文章 -->
+                <view v-if="article_list.length > 0" class="article-list padding-main border-radius-main oh bg-white spacing-mb">
+                    <view mode="aspectFit" class="new-icon va-m fl cp pr divider-r" data-value="/pages/article-category/article-category" @tap="url_event"> <text>最新</text><text class="cr-red">资讯</text> </view>
+                    <view class="right-content fr va-m">
+                        <swiper :vertical="true" :autoplay="true" :circular="true" display-multiple-items="1" interval="3000">
+                            <block v-for="(item, index) in article_list" :key="index">
+                                <swiper-item class="single-text">
+                                    <text class="cr-base text-size-sm cp" :data-value="item.category_url" @tap="url_event">[{{ item.article_category_name }}]</text>
+                                    <text class="cr-base text-size-sm margin-left-xs cp" :style="(item.title_color || null) != null ? 'color:' + item.title_color + ' !important;' : ''" :data-value="item.url" @tap="url_event">{{ item.title }}</text>
+                                </swiper-item>
+                            </block>
+                        </swiper>
+                    </view>
+                </view>
 
-				<!-- 推荐文章 -->
-				<view v-if="article_list.length > 0" class="article-list padding-main border-radius-main oh bg-white spacing-mb">
-					<view mode="aspectFit" class="new-icon va-m fl cp pr divider-r" data-value="/pages/article-category/article-category" @tap="url_event">
-						<text>最新</text><text class="cr-red">资讯</text>
-					</view>
-					<view class="right-content fr va-m">
-						<swiper :vertical="true" :autoplay="true" :circular="true" display-multiple-items="1" interval="3000">
-							<block v-for="(item, index) in article_list" :key="index">
-								<swiper-item class="single-text">
-									<text class="cr-base text-size-sm cp" :data-value="item.category_url" @tap="url_event">[{{item.article_category_name}}]</text>
-									<text class="cr-base text-size-sm margin-left-xs cp" :style="(item.title_color || null) != null ? 'color:'+item.title_color+' !important;' : ''"
-										:data-value="item.url" @tap="url_event">{{item.title}}</text>
-								</swiper-item>
-							</block>
-						</swiper>
-					</view>
-				</view>
+                <!-- 按照插件顺序渲染插件数据 -->
+                <block v-if="plugins_sort_list.length > 0">
+                    <block v-for="(pv, pi) in plugins_sort_list" :key="pi">
+                        <!-- 首页中间广告 - 插件 -->
+                        <view v-if="pv.plugins == 'homemiddleadv' && (plugins_homemiddleadv_data || null) != null && plugins_homemiddleadv_data.length > 0" class="plugins-homemiddleadv oh">
+                            <view v-for="(item, index) in plugins_homemiddleadv_data" :key="index" class="item border-radius-main oh cp spacing-mb" :data-value="item.url || ''" @tap="url_event">
+                                <image class="dis-block wh-auto border-radius-main" :src="item.images" mode="widthFix"> </image>
+                            </view>
+                        </view>
 
-				<!-- 按照插件顺序渲染插件数据 -->
-				<block v-if="plugins_sort_list.length > 0">
-					<block v-for="(pv, pi) in plugins_sort_list" :key="pi">
-						<!-- 首页中间广告 - 插件 -->
-						<view v-if="pv.plugins == 'homemiddleadv' && (plugins_homemiddleadv_data || null) != null && plugins_homemiddleadv_data.length > 0" class="plugins-homemiddleadv oh">
-							<view v-for="(item, index) in plugins_homemiddleadv_data" :key="index" class="item border-radius-main oh cp spacing-mb" :data-value="item.url || ''" @tap="url_event">
-								<image class="dis-block wh-auto border-radius-main" :src="item.images" mode="widthFix">
-								</image>
-							</view>
-						</view>
+                        <!-- 限时秒杀 - 插件 -->
+                        <view
+                            v-if="pv.plugins == 'seckill' && (plugins_seckill_data || null) != null && (plugins_seckill_data.data || null) != null && (plugins_seckill_data.data.goods || null) != null && plugins_seckill_data.data.goods.length > 0"
+                            class="plugins-seckill-data border-radius-main padding-horizontal-main spacing-mb padding-top-main bg-white"
+                            :style="'background-image: url(' + plugins_seckill_data.data.home_bg + ');'"
+                        >
+                            <view class="spacing-nav-title flex-row jc-sb align-c">
+                                <view class="flex-1">
+                                    <image class="dis-inline-block va-m icon" :src="plugins_seckill_data.data.home_title_icon" mode="widthFix"></image>
+                                    <view class="dis-inline-block va-m margin-left-sm">
+                                        <component-countdown :propHour="plugins_seckill_data.data.time.hours" :propMinute="plugins_seckill_data.data.time.minutes" :propSecond="plugins_seckill_data.data.time.seconds"></component-countdown>
+                                    </view>
+                                </view>
+                                <navigator url="/pages/plugins/seckill/index/index" hover-class="none" class="arrow-right padding-right cr-grey text-size-xs">更多</navigator>
+                            </view>
+                            <component-goods-list :propData="{ style_type: 2, goods_list: plugins_seckill_data.data.goods }" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol" :propIsCartParaCurve="true" propSource="index"></component-goods-list>
+                        </view>
 
-						<!-- 限时秒杀 - 插件 -->
-						<view
-							v-if="pv.plugins == 'seckill' && (plugins_seckill_data || null) != null && (plugins_seckill_data.data || null) != null && (plugins_seckill_data.data.goods || null) != null && plugins_seckill_data.data.goods.length > 0"
-							class="plugins-seckill-data border-radius-main padding-horizontal-main spacing-mb padding-top-main bg-white"
-							:style="'background-image: url('+plugins_seckill_data.data.home_bg+');'">
-							<view class="spacing-nav-title flex-row jc-sb align-c">
-								<view class="flex-1">
-									<image class="dis-inline-block va-m icon" :src="plugins_seckill_data.data.home_title_icon" mode="widthFix"></image>
-									<view class="dis-inline-block va-m margin-left-sm">
-										<component-countdown :propHour="plugins_seckill_data.data.time.hours" :propMinute="plugins_seckill_data.data.time.minutes"
-											:propSecond="plugins_seckill_data.data.time.seconds"></component-countdown>
-									</view>
-								</view>
-								<navigator url="/pages/plugins/seckill/index/index" hover-class="none" class="arrow-right padding-right cr-grey text-size-xs">更多</navigator>
-							</view>
-							<component-goods-list :propData="{style_type: 2, goods_list: plugins_seckill_data.data.goods}" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol"
-								:propIsCartParaCurve="true" propSource="index"></component-goods-list>
-						</view>
+                        <!-- 活动配置-楼层顶部 - 插件 -->
+                        <block v-if="pv.plugins == 'activity' && (plugins_activity_data || null) != null">
+                            <component-activity-list :propConfig="plugins_activity_data.base" :propData="plugins_activity_data.data" propLocation="0" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol" :propIsCartParaCurve="true" propSource="index"></component-activity-list>
+                        </block>
 
-						<!-- 活动配置-楼层顶部 - 插件 -->
-						<block v-if="pv.plugins == 'activity' && (plugins_activity_data || null) != null">
-							<component-activity-list :propConfig="plugins_activity_data.base" :propData="plugins_activity_data.data" propLocation="0" :propLabel="plugins_label_data"
-								:propCurrencySymbol="currency_symbol" :propIsCartParaCurve="true" propSource="index"></component-activity-list>
-						</block>
+                        <!-- 门店 - 插件 -->
+                        <block v-if="pv.plugins == 'realstore' && (plugins_realstore_data || null) != null">
+                            <view v-if="(plugins_realstore_data.base.home_data_list_title || null) != null" class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                                <text class="text-wrapper title-left-border">{{ plugins_realstore_data.base.home_data_list_title }}</text>
+                                <navigator url="/pages/plugins/realstore/search/search" hover-class="none" class="arrow-right padding-right cr-grey">更多</navigator>
+                            </view>
+                            <component-realstore-list :propDataList="plugins_realstore_data.data"></component-realstore-list>
+                        </block>
 
-						<!-- 门店 - 插件 -->
-						<block v-if="pv.plugins == 'realstore' && (plugins_realstore_data || null) != null">
-							<view v-if="(plugins_realstore_data.base.home_data_list_title || null) != null" class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
-								<text class="text-wrapper title-left-border">{{plugins_realstore_data.base.home_data_list_title}}</text>
-								<navigator url="/pages/plugins/realstore/search/search" hover-class="none" class="arrow-right padding-right cr-grey">更多</navigator>
-							</view>
-							<component-realstore-list :propDataList="plugins_realstore_data.data"></component-realstore-list>
-						</block>
+                        <!-- 多商户 - 插件 -->
+                        <block v-if="pv.plugins == 'shop' && (plugins_shop_data || null) != null">
+                            <view v-if="(plugins_shop_data.base.home_data_list_title || null) != null" class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                                <text class="text-wrapper title-left-border">{{ plugins_shop_data.base.home_data_list_title }}</text>
+                                <navigator url="/pages/plugins/shop/index/index" hover-class="none" class="arrow-right padding-right cr-grey">更多</navigator>
+                            </view>
+                            <component-shop-list :propConfig="plugins_shop_data.base" :propDataList="plugins_shop_data.data"></component-shop-list>
+                        </block>
 
-						<!-- 多商户 - 插件 -->
-						<block v-if="pv.plugins == 'shop' && (plugins_shop_data || null) != null">
-							<view v-if="(plugins_shop_data.base.home_data_list_title || null) != null" class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
-								<text class="text-wrapper title-left-border">{{plugins_shop_data.base.home_data_list_title}}</text>
-								<navigator url="/pages/plugins/shop/index/index" hover-class="none" class="arrow-right padding-right cr-grey">更多</navigator>
-							</view>
-							<component-shop-list :propConfig="plugins_shop_data.base" :propDataList="plugins_shop_data.data"></component-shop-list>
-						</block>
+                        <!-- 组合搭配 - 插件 -->
+                        <block v-if="pv.plugins == 'binding' && (plugins_binding_data || null) != null">
+                            <view v-if="(plugins_binding_data.base.home_data_list_title || null) != null" class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                                <text class="text-wrapper title-left-border">{{ plugins_binding_data.base.home_data_list_title }}</text>
+                                <navigator url="/pages/plugins/binding/index/index" hover-class="none" class="arrow-right padding-right cr-grey">更多</navigator>
+                            </view>
+                            <component-binding-list :propConfig="plugins_binding_data.base" :propDataList="plugins_binding_data.data" :propCurrencySymbol="currency_symbol"></component-binding-list>
+                        </block>
 
-						<!-- 组合搭配 - 插件 -->
-						<block v-if="pv.plugins == 'binding' && (plugins_binding_data || null) != null">
-							<view v-if="(plugins_binding_data.base.home_data_list_title || null) != null" class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
-								<text class="text-wrapper title-left-border">{{plugins_binding_data.base.home_data_list_title}}</text>
-								<navigator url="/pages/plugins/binding/index/index" hover-class="none" class="arrow-right padding-right cr-grey">更多</navigator>
-							</view>
-							<component-binding-list :propConfig="plugins_binding_data.base" :propDataList="plugins_binding_data.data" :propCurrencySymbol="currency_symbol"></component-binding-list>
-						</block>
+                        <!-- 博客-楼层顶部 - 插件 -->
+                        <block v-if="pv.plugins == 'blog' && (plugins_blog_data || null) != null">
+                            <component-blog-list :propConfig="plugins_blog_data.base" :propData="plugins_blog_data.data" propLocation="0"></component-blog-list>
+                        </block>
 
-						<!-- 博客-楼层顶部 - 插件 -->
-						<block v-if="pv.plugins == 'blog' && (plugins_blog_data || null) != null">
-							<component-blog-list :propConfig="plugins_blog_data.base" :propData="plugins_blog_data.data" propLocation="0"></component-blog-list>
-						</block>
+                        <!-- 热门推荐 -->
+                        <block v-if="pv.plugins == 'seckill'">
+                            <component-recommed-hot></component-recommed-hot>
+                        </block>
+                    </block>
+                </block>
 
-						<!-- 热门推荐 -->
-						<block v-if="pv.plugins == 'seckill'">
-							<component-recommed-hot></component-recommed-hot>
-						</block>
-					</block>
-				</block>
+                <!-- 楼层数据 -->
+                <block v-if="(data_list || null) != null && data_list.length > 0">
+                    <!-- 数据模式0,1自动+手动、2拖拽 -->
+                    <block v-if="home_index_floor_data_type == 2">
+                        <!-- 引入拖拽数据模块 -->
+                        <component-layout :propData="data_list"></component-layout>
+                    </block>
+                    <block v-else>
+                        <!-- 自动+手动 -->
+                        <view v-for="(floor, index) in data_list" :key="index" class="floor">
+                            <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                                <view class="title-left">
+                                    <text class="text-wrapper title-left-border" :style="'color:' + (floor.bg_color || '#333') + ';'">{{ floor.name }}</text>
+                                    <text v-if="(floor.describe || null) != null" class="vice-name margin-left-lg cr-gray">{{ floor.describe }}</text>
+                                </view>
+                                <navigator :url="'/pages/goods-search/goods-search?category_id=' + floor.id" hover-class="none" class="arrow-right padding-right cr-grey">更多 </navigator>
+                            </view>
+                            <view class="floor-list wh-auto oh pr">
+                                <block v-if="floor.goods.length > 0">
+                                    <component-goods-list :propData="{ style_type: 1, goods_list: floor.goods }" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol" :propIsCartParaCurve="true" propSource="index"></component-goods-list>
+                                </block>
+                            </view>
+                        </view>
+                    </block>
+                </block>
 
-				<!-- 楼层数据 -->
-				<block v-if="(data_list || null) != null && data_list.length > 0">
-					<!-- 数据模式0,1自动+手动、2拖拽 -->
-					<block v-if="home_index_floor_data_type == 2">
-						<!-- 引入拖拽数据模块 -->
-						<component-layout :propData="data_list"></component-layout>
-					</block>
-					<block v-else>
-						<!-- 自动+手动 -->
-						<view v-for="(floor, index) in data_list" :key="index" class="floor">
-							<view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
-								<view class="title-left">
-									<text class="text-wrapper title-left-border" :style="'color:'+(floor.bg_color || '#333')+';'">{{floor.name}}</text>
-									<text v-if="(floor.describe || null) != null" class="vice-name margin-left-lg cr-gray">{{floor.describe}}</text>
-								</view>
-								<navigator :url="'/pages/goods-search/goods-search?category_id=' + floor.id" hover-class="none" class="arrow-right padding-right cr-grey">更多
-								</navigator>
-							</view>
-							<view class="floor-list wh-auto oh pr">
-								<block v-if="floor.goods.length > 0">
-									<component-goods-list :propData="{style_type: 1, goods_list: floor.goods}" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol"
-										:propIsCartParaCurve="true" propSource="index"></component-goods-list>
-								</block>
-							</view>
-						</view>
-					</block>
-				</block>
+                <!-- 按照插件顺序渲染插件数据 -->
+                <block v-if="plugins_sort_list.length > 0">
+                    <block v-for="(pv, pi) in plugins_sort_list" :key="pi">
+                        <!-- 活动配置-楼层底部 - 插件 -->
+                        <block v-if="pv.plugins == 'activity' && (plugins_activity_data || null) != null">
+                            <component-activity-list :propConfig="plugins_activity_data.base" :propData="plugins_activity_data.data" propLocation="1" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol" propSource="index"></component-activity-list>
+                        </block>
 
-				<!-- 按照插件顺序渲染插件数据 -->
-				<block v-if="plugins_sort_list.length > 0">
-					<block v-for="(pv, pi) in plugins_sort_list" :key="pi">
-						<!-- 活动配置-楼层底部 - 插件 -->
-						<block v-if="pv.plugins == 'activity' && (plugins_activity_data || null) != null">
-							<component-activity-list :propConfig="plugins_activity_data.base" :propData="plugins_activity_data.data" propLocation="1" :propLabel="plugins_label_data"
-								:propCurrencySymbol="currency_symbol" propSource="index"></component-activity-list>
-						</block>
+                        <!-- 弹屏广告 - 插件 -->
+                        <view v-if="(plugins_popupscreen_data || null) != null && plugins_popupscreen_status == 1" class="plugins-popupscreen wh-auto ht-auto">
+                            <view class="content pr">
+                                <view class="close pa cp" @tap.stop="plugins_popupscreen_close_event">
+                                    <uni-icons type="clear" size="46rpx" color="#999"></uni-icons>
+                                </view>
+                                <image class="dis-block auto" :src="plugins_popupscreen_data.images" mode="widthFix" :data-value="plugins_popupscreen_data.images_url || ''" @tap="url_event"></image>
+                            </view>
+                        </view>
 
-						<!-- 弹屏广告 - 插件 -->
-						<view v-if="(plugins_popupscreen_data || null) != null && plugins_popupscreen_status == 1" class="plugins-popupscreen wh-auto ht-auto">
-							<view class="content pr">
-								<view class="close pa cp" @tap.stop="plugins_popupscreen_close_event">
-									<uni-icons type="clear" size="46rpx" color="#999"></uni-icons>
-								</view>
-								<image class="dis-block auto" :src="plugins_popupscreen_data.images" mode="widthFix" :data-value="plugins_popupscreen_data.images_url || ''" @tap="url_event"></image>
-							</view>
-						</view>
+                        <!--- 底部购买记录 - 插件 -->
+                        <view v-if="pv.plugins == 'salerecords' && (plugins_salerecords_data || null) != null && (plugins_salerecords_data.data || null) != null && plugins_salerecords_data.data.length > 0" class="plugins-salerecords bg-white border-radius-main padding-main spacing-mb">
+                            <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                                <view class="title-left">
+                                    <text class="text-wrapper">{{ plugins_salerecords_data.base.home_bottom_title || "最新购买" }}</text>
+                                    <text v-if="(plugins_salerecords_data.base || null) != null && (plugins_salerecords_data.base.home_bottom_desc || null) != null" class="vice-name margin-left-sm cr-grey-9">{{ plugins_salerecords_data.base.home_bottom_desc }}</text>
+                                </view>
+                            </view>
+                            <view class="oh">
+                                <swiper
+                                    :vertical="true"
+                                    :autoplay="true"
+                                    :circular="true"
+                                    :display-multiple-items="plugins_salerecords_data.data.length < 6 ? plugins_salerecords_data.data.length : 6"
+                                    interval="3000"
+                                    :style="plugins_salerecords_data.data.length < 6 ? 'height:' + plugins_salerecords_data.data.length * 84.33 + 'rpx;' : ''"
+                                >
+                                    <block v-for="(item, index) in plugins_salerecords_data.data" :key="index">
+                                        <swiper-item>
+                                            <view class="item oh padding-vertical-main">
+                                                <view class="item-content single-text fl">
+                                                    <image mode="widthFix" :src="item.user.avatar" class="va-m br"> </image>
+                                                    <text class="margin-left-sm">{{ item.user.user_name_view }}</text>
+                                                    <text v-if="(item.user.province || null) != null"><text class="padding-left-xs padding-right-xs">-</text>{{ item.user.province }}</text>
+                                                </view>
+                                                <view class="item-content fl">
+                                                    <navigator :url="item.goods_url" hover-class="none" class="single-text">
+                                                        <image mode="widthFix" :src="item.images" class="va-m br"> </image>
+                                                        <text class="margin-left-sm single-text">{{ item.title }}</text>
+                                                    </navigator>
+                                                </view>
+                                                <view class="item-content single-text fr tr cr-gray padding-top-xs">
+                                                    {{ item.add_time }}
+                                                </view>
+                                            </view>
+                                        </swiper-item>
+                                    </block>
+                                </swiper>
+                            </view>
+                        </view>
+                    </block>
+                </block>
 
-						<!--- 底部购买记录 - 插件 -->
-						<view
-							v-if="pv.plugins == 'salerecords' && (plugins_salerecords_data || null) != null && (plugins_salerecords_data.data || null) != null && plugins_salerecords_data.data.length > 0"
-							class="plugins-salerecords bg-white border-radius-main padding-main spacing-mb">
-							<view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
-								<view class="title-left">
-									<text class="text-wrapper">{{plugins_salerecords_data.base.home_bottom_title || '最新购买'}}</text>
-									<text v-if="(plugins_salerecords_data.base || null) != null && (plugins_salerecords_data.base.home_bottom_desc || null) != null"
-										class="vice-name margin-left-sm cr-grey-9">{{plugins_salerecords_data.base.home_bottom_desc}}</text>
-								</view>
-							</view>
-							<view class="oh">
-								<swiper :vertical="true" :autoplay="true" :circular="true" :display-multiple-items="plugins_salerecords_data.data.length < 6 ? plugins_salerecords_data.data.length : 6"
-									interval="3000" :style="plugins_salerecords_data.data.length < 6 ? 'height:'+(plugins_salerecords_data.data.length*84.33)+'rpx;' : ''">
-									<block v-for="(item, index) in plugins_salerecords_data.data" :key="index">
-										<swiper-item>
-											<view class="item oh padding-vertical-main">
-												<view class="item-content single-text fl">
-													<image mode="widthFix" :src="item.user.avatar" class="va-m br">
-													</image>
-													<text class="margin-left-sm">{{item.user.user_name_view}}</text>
-													<text v-if="(item.user.province || null) != null"><text class="padding-left-xs padding-right-xs">-</text>{{item.user.province}}</text>
-												</view>
-												<view class="item-content fl">
-													<navigator :url="item.goods_url" hover-class="none" class="single-text">
-														<image mode="widthFix" :src="item.images" class="va-m br">
-														</image>
-														<text class="margin-left-sm single-text">{{item.title}}</text>
-													</navigator>
-												</view>
-												<view class="item-content single-text fr tr cr-gray padding-top-xs">
-													{{item.add_time}}
-												</view>
-											</view>
-										</swiper-item>
-									</block>
-								</swiper>
-							</view>
-						</view>
-					</block>
-				</block>
+                <!-- 弹屏广告 - 插件 -->
+                <view v-if="(plugins_popupscreen_data || null) != null && plugins_popupscreen_status == 1" class="plugins-popupscreen wh-auto ht-auto">
+                    <view class="content pr">
+                        <icon type="clear" size="46rpx" class="close pa cp" @tap.stop="plugins_popupscreen_close_event"> </icon>
+                        <image class="dis-block auto" :src="plugins_popupscreen_data.images" mode="widthFix" :data-value="plugins_popupscreen_data.images_url || ''" @tap="url_event"></image>
+                    </view>
+                </view>
 
-				<!-- 弹屏广告 - 插件 -->
-				<view v-if="(plugins_popupscreen_data || null) != null && plugins_popupscreen_status == 1" class="plugins-popupscreen wh-auto ht-auto">
-					<view class="content pr">
-						<icon type="clear" size="46rpx" class="close pa cp" @tap.stop="plugins_popupscreen_close_event">
-						</icon>
-						<image class="dis-block auto" :src="plugins_popupscreen_data.images" mode="widthFix" :data-value="plugins_popupscreen_data.images_url || ''" @tap="url_event"></image>
-					</view>
-				</view>
+                <!-- 留言 -->
+                <view v-if="load_status == 1 && common_app_is_enable_answer == 1" class="bg-white border-radius-main oh spacing-mt">
+                    <navigator url="/pages/answer-form/answer-form" hover-class="none">
+                        <image mode="widthFix" :src="static_url + 'answer-form.jpg'" class="wh-auto border-radius-main"> </image>
+                    </navigator>
+                </view>
+            </view>
 
-				<!-- 留言 -->
-				<view v-if="load_status == 1 && common_app_is_enable_answer == 1" class="bg-white border-radius-main oh spacing-mt">
-					<navigator url="/pages/answer-form/answer-form" hover-class="none">
-						<image mode="widthFix" :src="static_url+'answer-form.jpg'" class="wh-auto border-radius-main">
-						</image>
-					</navigator>
-				</view>
-			</view>
+            <!-- 提示信息 -->
+            <block v-if="load_status == 0">
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </block>
 
-			<!-- 提示信息 -->
-			<block v-if="load_status == 0">
-				<component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
-			</block>
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
 
-			<!-- 结尾 -->
-			<component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            <!-- 版权信息 -->
+            <view v-if="load_status == 1">
+                <component-copyright></component-copyright>
+            </view>
+        </view>
 
-			<!-- 版权信息 -->
-			<view v-if="load_status == 1">
-				<component-copyright></component-copyright>
-			</view>
-		</view>
+        <!-- 在线客服 -->
+        <component-online-service :propIsNav="true" :propIsBar="true" :propIsGrayscale="plugins_mourning_data_is_app"></component-online-service>
 
-		<!-- 在线客服 -->
-		<component-online-service :propIsNav="true" :propIsBar="true" :propIsGrayscale="plugins_mourning_data_is_app"></component-online-service>
+        <!-- 快捷导航 -->
+        <component-quick-nav :propIsNav="true" :propIsBar="true" :propIsGrayscale="plugins_mourning_data_is_app"></component-quick-nav>
 
-		<!-- 快捷导航 -->
-		<component-quick-nav :propIsNav="true" :propIsBar="true" :propIsGrayscale="plugins_mourning_data_is_app"></component-quick-nav>
-
-		<!-- 用户基础 -->
-		<component-user-base ref="user_base" :propIsGrayscale="plugins_mourning_data_is_app"></component-user-base>
-	</view>
+        <!-- 用户基础 -->
+        <component-user-base ref="user_base" :propIsGrayscale="plugins_mourning_data_is_app"></component-user-base>
+    </view>
 </template>
 
 <script>
-	const app = getApp();
-	import componentSearch from "../../components/search/search";
-	import componentQuickNav from "../../components/quick-nav/quick-nav";
-	import componentIconNav from "../../components/icon-nav/icon-nav";
-	import componentBanner from "../../components/slider/slider";
-	import componentCountdown from "../../components/countdown/countdown";
-	import componentLayout from "../../components/layout/layout";
-	import componentBadge from "../../components/badge/badge";
-	import componentNoData from "../../components/no-data/no-data";
-	import componentBottomLine from "../../components/bottom-line/bottom-line";
-	import componentCopyright from "../../components/copyright/copyright";
-	import componentOnlineService from "../../components/online-service/online-service";
-	import componentActivityList from "../../components/activity-list/activity-list";
-	import componentBlogList from "../../components/blog-list/blog-list";
-	import componentRealstoreList from "../../components/realstore-list/realstore-list";
-	import componentShopList from "../../components/shop-list/shop-list";
-	import componentGoodsList from "../../components/goods-list/goods-list";
-	import componentUserBase from "../../components/user-base/user-base";
-	import componentBindingList from "../../components/binding-list/binding-list";
-	import componentNotice from "@/components/notice/notice"
-	import componentRecommedHot from '@/components/recommend-hot/recommend-hot'
+const app = getApp();
+import componentSearch from "../../components/search/search";
+import componentQuickNav from "../../components/quick-nav/quick-nav";
+import componentIconNav from "../../components/icon-nav/icon-nav";
+import componentBanner from "../../components/slider/slider";
+import componentCountdown from "../../components/countdown/countdown";
+import componentLayout from "../../components/layout/layout";
+import componentBadge from "../../components/badge/badge";
+import componentNoData from "../../components/no-data/no-data";
+import componentBottomLine from "../../components/bottom-line/bottom-line";
+import componentCopyright from "../../components/copyright/copyright";
+import componentOnlineService from "../../components/online-service/online-service";
+import componentActivityList from "../../components/activity-list/activity-list";
+import componentBlogList from "../../components/blog-list/blog-list";
+import componentRealstoreList from "../../components/realstore-list/realstore-list";
+import componentShopList from "../../components/shop-list/shop-list";
+import componentGoodsList from "../../components/goods-list/goods-list";
+import componentUserBase from "../../components/user-base/user-base";
+import componentBindingList from "../../components/binding-list/binding-list";
+import componentNotice from "@/components/notice/notice";
+import componentRecommedHot from "@/components/recommend-hot/recommend-hot";
 
-	var common_static_url = app.globalData.get_static_url('common');
-	var static_url = app.globalData.get_static_url('home');
-	// 状态栏高度
-	var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
-	// #ifdef MP-TOUTIAO
-	bar_height = 0;
-	// #endif
+var common_static_url = app.globalData.get_static_url("common");
+var static_url = app.globalData.get_static_url("home");
+// 状态栏高度
+var bar_height = parseInt(app.globalData.get_system_info("statusBarHeight", 0, true));
+// #ifdef MP-TOUTIAO
+bar_height = 0;
+// #endif
 
-	export default {
-		data() {
-			return {
-				common_static_url: common_static_url,
-				static_url: static_url,
-				data_list_loding_status: 1,
-				data_list_loding_msg: '',
-				data_bottom_line_status: false,
-				load_status: 0,
-				currency_symbol: app.globalData.data.currency_symbol,
-				data_list: [],
-				banner_list: [],
-				navigation: [],
-				article_list: [],
-				cart_total: 0,
-				message_total: 0,
-				right_icon_list: [],
-				// 基础配置
-				common_shop_notice: null,
-				home_index_floor_data_type: 0,
-				common_app_is_enable_search: 0,
-				common_app_is_enable_answer: 0,
-				common_app_is_header_nav_fixed: 0,
-				common_app_is_online_service: 0,
-				// 名称
-				application_title: app.globalData.data.application_title,
-				application_logo: app.globalData.data.application_logo,
-				is_logo_use_text: app.globalData.data.is_logo_use_text || 0,
-				// 顶部+搜索样式配置
-				top_content_style: 'background-image: url("' + static_url + 'nav-top.png");' + 'padding-top:' + (
-					bar_height + 8) + 'px;',
-				search_style: '',
-				search_is_fixed: 0,
-				// 是否单页预览
-				is_single_page: app.globalData.is_current_single_page() || 0,
-				// 轮播滚动时，背景色替换
-				slider_bg: null,
-				// 插件顺序列表
-				plugins_sort_list: [],
-				// 限时秒杀插件
-				plugins_seckill_data: null,
-				// 购买记录插件
-				plugins_salerecords_data: null,
-				// 活动配置插件
-				plugins_activity_data: null,
-				// 标签插件
-				plugins_label_data: null,
-				// 首页中间广告插件
-				plugins_homemiddleadv_data: null,
-				// 弹屏广告、这里设置一天后可以再次显示
-				plugins_popupscreen_data: null,
-				plugins_popupscreen_status: 0,
-				plugins_popupscreen_cache_key: 'plugins_popupscreen_cache_key',
-				plugins_popupscreen_timer: null,
-				// 哀悼灰度插件
-				plugins_mourning_data_is_app: app.globalData.is_app_mourning(),
-				// 标签插件
-				plugins_blog_data: null,
-				// 门店插件
-				plugins_realstore_data: null,
-				// 多商户插件
-				plugins_shop_data: null,
-				// 组合搭配插件
-				plugins_binding_data: null
-			};
-		},
+export default {
+    data() {
+        return {
+            common_static_url: common_static_url,
+            static_url: static_url,
+            data_list_loding_status: 1,
+            data_list_loding_msg: "",
+            data_bottom_line_status: false,
+            load_status: 0,
+            currency_symbol: app.globalData.data.currency_symbol,
+            data_list: [],
+            banner_list: [],
+            navigation: [],
+            article_list: [],
+            cart_total: 0,
+            message_total: 0,
+            right_icon_list: [],
+            // 基础配置
+            common_shop_notice: null,
+            home_index_floor_data_type: 0,
+            common_app_is_enable_search: 0,
+            common_app_is_enable_answer: 0,
+            common_app_is_header_nav_fixed: 0,
+            common_app_is_online_service: 0,
+            // 名称
+            application_title: app.globalData.data.application_title,
+            application_logo: app.globalData.data.application_logo,
+            is_logo_use_text: app.globalData.data.is_logo_use_text || 0,
+            // 顶部+搜索样式配置
+            top_content_style: 'background-image: url("' + static_url + 'nav-top.png");' + "padding-top:" + (bar_height + 8) + "px;",
+            search_style: "",
+            search_is_fixed: 0,
+            // 是否单页预览
+            is_single_page: app.globalData.is_current_single_page() || 0,
+            // 轮播滚动时，背景色替换
+            slider_bg: null,
+            // 插件顺序列表
+            plugins_sort_list: [],
+            // 限时秒杀插件
+            plugins_seckill_data: null,
+            // 购买记录插件
+            plugins_salerecords_data: null,
+            // 活动配置插件
+            plugins_activity_data: null,
+            // 标签插件
+            plugins_label_data: null,
+            // 首页中间广告插件
+            plugins_homemiddleadv_data: null,
+            // 弹屏广告、这里设置一天后可以再次显示
+            plugins_popupscreen_data: null,
+            plugins_popupscreen_status: 0,
+            plugins_popupscreen_cache_key: "plugins_popupscreen_cache_key",
+            plugins_popupscreen_timer: null,
+            // 哀悼灰度插件
+            plugins_mourning_data_is_app: app.globalData.is_app_mourning(),
+            // 标签插件
+            plugins_blog_data: null,
+            // 门店插件
+            plugins_realstore_data: null,
+            // 多商户插件
+            plugins_shop_data: null,
+            // 组合搭配插件
+            plugins_binding_data: null,
+        };
+    },
 
-		components: {
-			componentSearch,
-			componentQuickNav,
-			componentIconNav,
-			componentBanner,
-			componentCountdown,
-			componentLayout,
-			componentBadge,
-			componentNoData,
-			componentBottomLine,
-			componentCopyright,
-			componentOnlineService,
-			componentActivityList,
-			componentBlogList,
-			componentRealstoreList,
-			componentShopList,
-			componentGoodsList,
-			componentUserBase,
-			componentBindingList,
-			componentNotice,
-			componentRecommedHot
-		},
-		props: {},
+    components: {
+        componentSearch,
+        componentQuickNav,
+        componentIconNav,
+        componentBanner,
+        componentCountdown,
+        componentLayout,
+        componentBadge,
+        componentNoData,
+        componentBottomLine,
+        componentCopyright,
+        componentOnlineService,
+        componentActivityList,
+        componentBlogList,
+        componentRealstoreList,
+        componentShopList,
+        componentGoodsList,
+        componentUserBase,
+        componentBindingList,
+        componentNotice,
+        componentRecommedHot,
+    },
+    props: {},
 
-		onShow() {
-			// 数据加载
-			this.init();
+    onShow() {
+        // 数据加载
+        this.init();
 
-			// 初始化配置
-			this.init_config();
+        // 初始化配置
+        this.init_config();
 
-			// 用户头像和昵称设置提示
-			if ((this.$refs.user_base || null) != null) {
-				this.$refs.user_base.init('index');
-			}
-		},
+        // 用户头像和昵称设置提示
+        if ((this.$refs.user_base || null) != null) {
+            this.$refs.user_base.init("index");
+        }
+    },
 
-		// 下拉刷新
-		onPullDownRefresh() {
-			this.init();
-		},
+    // 下拉刷新
+    onPullDownRefresh() {
+        this.init();
+    },
 
-		methods: {
-			// 初始化配置
-			init_config(status) {
-				if ((status || false) == true) {
-					this.setData({
-						currency_symbol: app.globalData.get_config('currency_symbol'),
-						common_shop_notice: app.globalData.get_config('config.common_shop_notice'),
-						home_index_floor_data_type: app.globalData.get_config('config.home_index_floor_data_type'),
-						common_app_is_enable_search: app.globalData.get_config(
-							'config.common_app_is_enable_search'),
-						common_app_is_enable_answer: app.globalData.get_config(
-							'config.common_app_is_enable_answer'),
-						common_app_is_header_nav_fixed: app.globalData.get_config(
-							'config.common_app_is_header_nav_fixed'),
-						common_app_is_online_service: app.globalData.get_config(
-							'config.common_app_is_online_service'),
-						application_title: app.globalData.get_application_title(),
-						application_logo: app.globalData.get_application_logo()
-					});
-				} else {
-					app.globalData.is_config(this, 'init_config');
-				}
-			},
+    methods: {
+        // 初始化配置
+        init_config(status) {
+            if ((status || false) == true) {
+                this.setData({
+                    currency_symbol: app.globalData.get_config("currency_symbol"),
+                    common_shop_notice: app.globalData.get_config("config.common_shop_notice"),
+                    home_index_floor_data_type: app.globalData.get_config("config.home_index_floor_data_type"),
+                    common_app_is_enable_search: app.globalData.get_config("config.common_app_is_enable_search"),
+                    common_app_is_enable_answer: app.globalData.get_config("config.common_app_is_enable_answer"),
+                    common_app_is_header_nav_fixed: app.globalData.get_config("config.common_app_is_header_nav_fixed"),
+                    common_app_is_online_service: app.globalData.get_config("config.common_app_is_online_service"),
+                    application_title: app.globalData.get_application_title(),
+                    application_logo: app.globalData.get_application_logo(),
+                });
+            } else {
+                app.globalData.is_config(this, "init_config");
+            }
+        },
 
-			// 获取数据
-			init() {
-				this.setData({
-					data_list_loding_status: 1
-				});
-				uni.request({
-					url: app.globalData.get_request_url("index", "index"),
-					method: 'POST',
-					data: {},
-					dataType: 'json',
-					success: res => {
-						uni.stopPullDownRefresh();
-						// 获取最新缓存
-						if (this.load_status == 0) {
-							this.init_config(true);
-						}
+        // 获取数据
+        init() {
+            this.setData({
+                data_list_loding_status: 1,
+            });
+            uni.request({
+                url: app.globalData.get_request_url("index", "index"),
+                method: "POST",
+                data: {},
+                dataType: "json",
+                success: (res) => {
+                    uni.stopPullDownRefresh();
+                    // 获取最新缓存
+                    if (this.load_status == 0) {
+                        this.init_config(true);
+                    }
 
-						// 设置首次加载状态
-						this.setData({
-							load_status: 1
-						});
+                    // 设置首次加载状态
+                    this.setData({
+                        load_status: 1,
+                    });
 
-						if (res.data.code == 0) {
-							var data = res.data.data;
-							this.setData({
-								data_bottom_line_status: true,
-								banner_list: data.banner_list || [],
-								navigation: data.navigation || [],
-								article_list: data.article_list || [],
-								data_list: data.data_list,
-								cart_total: data.cart_total.buy_number || 0,
-								message_total: parseInt(data.message_total || 0),
-								right_icon_list: data.right_icon_list || [],
-								data_list_loding_status: data.data_list.length == 0 ? 0 : 3,
-								plugins_sort_list: data.plugins_sort_list || [],
-								plugins_seckill_data: data.plugins_seckill_data || null,
-								plugins_salerecords_data: (data.plugins_salerecords_data || null) ==
-									null || data.plugins_salerecords_data.length <= 0 ? null : data
-									.plugins_salerecords_data,
-								plugins_activity_data: (data.plugins_activity_data || null) == null ||
-									data.plugins_activity_data.length <= 0 ? null : data
-									.plugins_activity_data,
-								plugins_label_data: (data.plugins_label_data || null) == null || (data
-										.plugins_label_data.base || null) == null || (data
-										.plugins_label_data.data || null) == null || data
-									.plugins_label_data.data.length <= 0 ? null : data
-									.plugins_label_data,
-								plugins_homemiddleadv_data: (data.plugins_homemiddleadv_data ||
-										null) == null || data.plugins_homemiddleadv_data.length <= 0 ?
-									null : data.plugins_homemiddleadv_data,
-								plugins_popupscreen_data: data.plugins_popupscreen_data || null,
-								plugins_mourning_data_is_app: parseInt(data.plugins_mourning_data ||
-									0) == 1,
-								plugins_blog_data: data.plugins_blog_data || null,
-								plugins_realstore_data: data.plugins_realstore_data || null,
-								plugins_shop_data: data.plugins_shop_data || null,
-								plugins_binding_data: data.plugins_binding_data || null
-							});
-							// 轮播数据处理
-							if (data.banner_list && data.banner_list.length > 0) {
-								this.slider_bg = 'background: linear-gradient(180deg, ' + data.banner_list[0]
-									.bg_color +
-									' 0%, #f5f5f5 80%);';
-							}
+                    if (res.data.code == 0) {
+                        var data = res.data.data;
+                        this.setData({
+                            data_bottom_line_status: true,
+                            banner_list: data.banner_list || [],
+                            navigation: data.navigation || [],
+                            article_list: data.article_list || [],
+                            data_list: data.data_list,
+                            cart_total: data.cart_total.buy_number || 0,
+                            message_total: parseInt(data.message_total || 0),
+                            right_icon_list: data.right_icon_list || [],
+                            data_list_loding_status: data.data_list.length == 0 ? 0 : 3,
+                            plugins_sort_list: data.plugins_sort_list || [],
+                            plugins_seckill_data: data.plugins_seckill_data || null,
+                            plugins_salerecords_data: (data.plugins_salerecords_data || null) == null || data.plugins_salerecords_data.length <= 0 ? null : data.plugins_salerecords_data,
+                            plugins_activity_data: (data.plugins_activity_data || null) == null || data.plugins_activity_data.length <= 0 ? null : data.plugins_activity_data,
+                            plugins_label_data: (data.plugins_label_data || null) == null || (data.plugins_label_data.base || null) == null || (data.plugins_label_data.data || null) == null || data.plugins_label_data.data.length <= 0 ? null : data.plugins_label_data,
+                            plugins_homemiddleadv_data: (data.plugins_homemiddleadv_data || null) == null || data.plugins_homemiddleadv_data.length <= 0 ? null : data.plugins_homemiddleadv_data,
+                            plugins_popupscreen_data: data.plugins_popupscreen_data || null,
+                            plugins_mourning_data_is_app: parseInt(data.plugins_mourning_data || 0) == 1,
+                            plugins_blog_data: data.plugins_blog_data || null,
+                            plugins_realstore_data: data.plugins_realstore_data || null,
+                            plugins_shop_data: data.plugins_shop_data || null,
+                            plugins_binding_data: data.plugins_binding_data || null,
+                        });
+                        // 轮播数据处理
+                        if (data.banner_list && data.banner_list.length > 0) {
+                            this.slider_bg = "background: linear-gradient(180deg, " + data.banner_list[0].bg_color + " 0%, #f5f5f5 80%);padding-top:" + (bar_height + 8) + "px;";
+                        }
 
-							// 弹屏广告插件处理
-							this.plugins_popupscreen_handle();
+                        // 弹屏广告插件处理
+                        this.plugins_popupscreen_handle();
 
-							// 导航购物车处理
-							if (this.cart_total <= 0) {
-								app.globalData.set_tab_bar_badge(2, 0);
-							} else {
-								app.globalData.set_tab_bar_badge(2, 1, this.cart_total);
-							}
+                        // 导航购物车处理
+                        if (this.cart_total <= 0) {
+                            app.globalData.set_tab_bar_badge(2, 0);
+                        } else {
+                            app.globalData.set_tab_bar_badge(2, 1, this.cart_total);
+                        }
 
-							// 搜索框宽度处理
-							// #ifdef MP-TOUTIAO
-							var len = (this.right_icon_list || []).length;
-							var val = (len <= 0) ? 0 : 66 * len;
-							this.setData({
-								search_style: 'width: calc(100% - ' + val + 'rpx);',
-							});
-							// #endif
-						} else {
-							this.setData({
-								data_list_loding_status: 0,
-								data_list_loding_msg: res.data.msg,
-								data_bottom_line_status: true
-							});
-							app.globalData.showToast(res.data.msg);
-						}
+                        // 搜索框宽度处理
+                        // #ifdef MP-TOUTIAO
+                        var len = (this.right_icon_list || []).length;
+                        var val = len <= 0 ? 0 : 66 * len;
+                        this.setData({
+                            search_style: "width: calc(100% - " + val + "rpx);",
+                        });
+                        // #endif
+                    } else {
+                        this.setData({
+                            data_list_loding_status: 0,
+                            data_list_loding_msg: res.data.msg,
+                            data_bottom_line_status: true,
+                        });
+                        app.globalData.showToast(res.data.msg);
+                    }
 
-						// 分享菜单处理、延时执行，确保基础数据已加载完成
-						setTimeout(function() {
-							app.globalData.page_share_handle();
-						}, 3000);
-					},
-					fail: () => {
-						uni.stopPullDownRefresh();
-						this.setData({
-							data_list_loding_status: 2,
-							data_list_loding_msg: '服务器请求出错',
-							data_bottom_line_status: true,
-							load_status: 1
-						});
-						app.globalData.showToast('服务器请求出错');
-					}
-				});
-			},
+                    // 分享菜单处理、延时执行，确保基础数据已加载完成
+                    setTimeout(function () {
+                        app.globalData.page_share_handle();
+                    }, 3000);
+                },
+                fail: () => {
+                    uni.stopPullDownRefresh();
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: "服务器请求出错",
+                        data_bottom_line_status: true,
+                        load_status: 1,
+                    });
+                    app.globalData.showToast("服务器请求出错");
+                },
+            });
+        },
 
-			// 页面滚动监听
-			onPageScroll(e) {
-				if (this.common_app_is_header_nav_fixed == 1 && this.common_app_is_enable_search == 1) {
-					var top = e.scrollTop > 35 ? 35 : e.scrollTop;
-					var num = top * 7;
-					var base = 230;
-					// #ifdef MP-ALIPAY
-					base = 235
-					// #endif
-					// #ifdef H5 || MP-TOUTIAO || APP
-					var len = (this.right_icon_list || []).length;
-					base = (len <= 0) ? 0 : 66 * len;
-					// #endif
-					// 开启哀悼插件的时候不需要浮动导航并且搜索框也不需要缩短、开启站点灰度会导致浮动失效
-					if (!this.plugins_mourning_data_is_app) {
-						var top_val = 35;
-						var val = (num > base) ? base : num;
-						// #ifdef MP-TOUTIAO
-						top_val = 0;
-						val = base
-						// #endif
-						this.setData({
-							search_style: 'width: calc(100% - ' + (val < 0 ? 0 : val) + 'rpx);',
-							search_is_fixed: (top >= top_val) ? 1 : 0,
-						});
-					}
-				}
-			},
+        // 页面滚动监听
+        onPageScroll(e) {
+            if (this.common_app_is_header_nav_fixed == 1 && this.common_app_is_enable_search == 1) {
+                var top = e.scrollTop > 35 ? 35 : e.scrollTop;
+                var num = top * 7;
+                var base = 230;
+                // #ifdef MP-ALIPAY
+                base = 235;
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO || APP
+                var len = (this.right_icon_list || []).length;
+                base = len <= 0 ? 0 : 66 * len;
+                // #endif
+                // 开启哀悼插件的时候不需要浮动导航并且搜索框也不需要缩短、开启站点灰度会导致浮动失效
+                if (!this.plugins_mourning_data_is_app) {
+                    var top_val = 35;
+                    var val = num > base ? base : num;
+                    // #ifdef MP-TOUTIAO
+                    top_val = 0;
+                    val = base;
+                    // #endif
+                    this.setData({
+                        search_style: "width: calc(100% - " + (val < 0 ? 0 : val) + "rpx);",
+                        search_is_fixed: top >= top_val ? 1 : 0,
+                    });
+                }
+            }
+        },
 
-			// url事件
-			url_event(e) {
-				app.globalData.url_event(e);
-			},
+        // url事件
+        url_event(e) {
+            app.globalData.url_event(e);
+        },
 
-			// 弹屏广告插件处理
-			plugins_popupscreen_handle() {
-				if (this.plugins_popupscreen_data != null) {
-					// 不存在关闭缓存或者超过间隔时间则显示
-					var cv = parseInt(uni.getStorageSync(this.plugins_popupscreen_cache_key)) || 0;
-					var pv = parseInt(this.plugins_popupscreen_data.interval_time) || 86400;
-					if (cv == 0 || cv + pv < app.globalData.get_timestamp()) {
-						// 是否开启自动关闭
-						var timer = null;
-						var ct = parseInt(this.plugins_popupscreen_data.close_time) || 0;
-						if (ct > 0) {
-							var self = this;
-							timer = setTimeout(function() {
-								self.setData({
-									plugins_popupscreen_status: 0
-								});
-								uni.setStorage({
-									key: self.plugins_popupscreen_cache_key,
-									data: app.globalData.get_timestamp()
-								});
-							}, ct * 1000);
-						}
-						this.setData({
-							plugins_popupscreen_status: 1,
-							plugins_popupscreen_timer: timer
-						});
-					}
-				}
-			},
+        // 弹屏广告插件处理
+        plugins_popupscreen_handle() {
+            if (this.plugins_popupscreen_data != null) {
+                // 不存在关闭缓存或者超过间隔时间则显示
+                var cv = parseInt(uni.getStorageSync(this.plugins_popupscreen_cache_key)) || 0;
+                var pv = parseInt(this.plugins_popupscreen_data.interval_time) || 86400;
+                if (cv == 0 || cv + pv < app.globalData.get_timestamp()) {
+                    // 是否开启自动关闭
+                    var timer = null;
+                    var ct = parseInt(this.plugins_popupscreen_data.close_time) || 0;
+                    if (ct > 0) {
+                        var self = this;
+                        timer = setTimeout(function () {
+                            self.setData({
+                                plugins_popupscreen_status: 0,
+                            });
+                            uni.setStorage({
+                                key: self.plugins_popupscreen_cache_key,
+                                data: app.globalData.get_timestamp(),
+                            });
+                        }, ct * 1000);
+                    }
+                    this.setData({
+                        plugins_popupscreen_status: 1,
+                        plugins_popupscreen_timer: timer,
+                    });
+                }
+            }
+        },
 
-			// 弹屏广告 - 插件 关闭事件
-			plugins_popupscreen_close_event(e) {
-				this.setData({
-					plugins_popupscreen_status: 0,
-				});
-				uni.setStorage({
-					key: this.plugins_popupscreen_cache_key,
-					data: app.globalData.get_timestamp()
-				});
-				clearInterval(this.plugins_popupscreen_timer);
-			},
-			// 轮播改变
-			changeBanner(color) {
-				this.slider_bg = 'background: linear-gradient(180deg,' + color + ' 0%, #f5f5f5 80%);';
-			}
-		}
-	};
+        // 弹屏广告 - 插件 关闭事件
+        plugins_popupscreen_close_event(e) {
+            this.setData({
+                plugins_popupscreen_status: 0,
+            });
+            uni.setStorage({
+                key: this.plugins_popupscreen_cache_key,
+                data: app.globalData.get_timestamp(),
+            });
+            clearInterval(this.plugins_popupscreen_timer);
+        },
+        // 轮播改变
+        changeBanner(color) {
+            this.slider_bg = "background: linear-gradient(180deg," + color + " 0%, #f5f5f5 80%);padding-top:" + (bar_height + 8) + "px;";
+        },
+    },
+};
 </script>
 <style>
-	@import './index.css';
-</style>
\ No newline at end of file
+@import "./index.css";
+</style>