From df72b41c66632667141069bdb670211dc56e5f95 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 16 Jul 2023 19:12:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/blog-comments/blog-comments.vue    |  42 +++---
 components/emoji-popup/emoji-popup.vue        |  52 +++----
 .../goods-batch-buy/goods-batch-buy.vue       |  54 +++----
 components/goods-buy/goods-buy.vue            |  54 +++----
 .../goods-spec-choice/goods-spec-choice.vue   |  56 +++----
 components/quick-nav/quick-nav.vue            |   2 +-
 components/share-popup/share-popup.vue        |  52 +++----
 components/user-base/user-base.vue            |   2 +-
 pages/buy/buy.vue                             |  58 ++++----
 pages/goods-detail/goods-detail.vue           |  10 +-
 pages/index/index.vue                         |  58 ++++----
 pages/login/login.vue                         |   2 +-
 pages/plugins/realstore/index/index.vue       |   2 +-
 .../signin/index-detail/index-detail.vue      |  14 +-
 .../user-orderaftersale-detail.vue            | 140 +++++++++---------
 15 files changed, 299 insertions(+), 299 deletions(-)

diff --git a/components/blog-comments/blog-comments.vue b/components/blog-comments/blog-comments.vue
index 63fe9d8b..76abad99 100644
--- a/components/blog-comments/blog-comments.vue
+++ b/components/blog-comments/blog-comments.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <view>
         <view v-if="(data || null) != null && (data_base || null) != null" class="padding-vertical-main">
             <view class="padding-horizontal-main">
@@ -126,7 +126,7 @@
                         <text>回复 @{{input_comments_modal_username}}</text>
                         <view class="close pa">
                             <view @tap.stop="modal_close_event">
-                                <icon type="clear" size="20"></icon>
+                                <icon type="clear" size="46rpx"></icon>
                             </view>
                         </view>
                     </view>
@@ -146,17 +146,17 @@
 
             <!-- 分享弹窗 -->
             <component-share-popup ref="share"></component-share-popup>
-        </view>
-    </view>
-</template>
-<script>
+        </view>
+    </view>
+</template>
+<script>
     const app = getApp();
     var common_static_url = app.globalData.get_static_url('common');
     import componentPopup from "../../components/popup/popup";
     import componentSharePopup from "../../components/share-popup/share-popup";
-    import componentEmojiPopup from "../../components/emoji-popup/emoji-popup";
-    export default {
-        data() {
+    import componentEmojiPopup from "../../components/emoji-popup/emoji-popup";
+    export default {
+        data() {
             return {
                 common_static_url: common_static_url,
                 avatar: app.globalData.data.default_user_head_src,
@@ -172,8 +172,8 @@
                 input_comments_modal_index: 0,
                 input_comments_modal_username: '',
                 input_comments_modal_blog_comments_id: 0,
-                input_comments_modal_reply_comments_id: 0
-            };
+                input_comments_modal_reply_comments_id: 0
+            };
         },
         props: {
             propType: {
@@ -192,13 +192,13 @@
             	type: [Array,null],
             	default: []
             }
-        },
+        },
         components: {
             componentPopup,
             componentSharePopup,
-            componentEmojiPopup
-        },
-
+            componentEmojiPopup
+        },
+
         // 页面被展示
         created: function(e) {
             var avatar = app.globalData.data.default_user_head_src;
@@ -210,8 +210,8 @@
                 data_base: this.propDataBase,
                 emoji_list: this.propEmojiList
             });
-        },
-
+        },
+
         methods: {
             // 分享开启弹层
             popup_share_event(e) {
@@ -513,9 +513,9 @@
             url_event(e) {
                 app.globalData.url_event(e);
             }
-        }
-    };
-</script>
+        }
+    };
+</script>
 <style>
     /**
      * 聚合点赞、评论、分享
@@ -584,5 +584,5 @@
     }
     .blog-comments-right-content-operate > .item:not(:last-child) {
         margin-right: 30rpx;
-    }
+    }
 </style>
\ No newline at end of file
diff --git a/components/emoji-popup/emoji-popup.vue b/components/emoji-popup/emoji-popup.vue
index 799121ae..0d90499e 100644
--- a/components/emoji-popup/emoji-popup.vue
+++ b/components/emoji-popup/emoji-popup.vue
@@ -1,10 +1,10 @@
-<template>
+<template>
     <view>
         <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event">
             <view class="emoji-popup bg-white">
                 <view class="close fr oh">
                     <view class="fr" @tap.stop="popup_close_event">
-                        <icon type="clear" size="20"></icon>
+                        <icon type="clear" size="46rpx"></icon>
                     </view>
                 </view>
                 <view class="emoji-popup-content oh tc">
@@ -15,30 +15,30 @@
                     </block>
                 </view>
             </view>
-        </component-popup>
-    </view>
-</template>
-<script>
+        </component-popup>
+    </view>
+</template>
+<script>
     const app = getApp();
     var common_static_url = app.globalData.get_static_url('common');
-    import componentPopup from "../../components/popup/popup";
-    export default {
-        data() {
+    import componentPopup from "../../components/popup/popup";
+    export default {
+        data() {
             return {
-                common_static_url: common_static_url,
+                common_static_url: common_static_url,
                 popup_status: false,
-                emoji_list: []
-            };
-        },
-
+                emoji_list: []
+            };
+        },
+
         components: {
-            componentPopup
-        },
-
-        created: function() {},
-
-        methods: {
-            // 初始配置
+            componentPopup
+        },
+
+        created: function() {},
+
+        methods: {
+            // 初始配置
             init(config = {}) {
                 if(!app.globalData.is_single_page_check()) {
                     return false;
@@ -46,7 +46,7 @@
                 this.setData({
                     popup_status: config.status == undefined ? true : config.status,
                     emoji_list: config.emoji_list || [],
-                });
+                });
             },
 
             // 弹层关闭
@@ -66,9 +66,9 @@
                 // 调用父级
                 this.$emit('choiceConfirmEvent', e.currentTarget.dataset.value);
             }
-        }
-    };
-</script>
+        }
+    };
+</script>
 <style>
     .emoji-popup {
         padding: 20rpx 10rpx 0 10rpx;
@@ -90,5 +90,5 @@
         height: 130rpx;
         line-height: 130rpx;
         width: 25%;
-    }
+    }
 </style>
\ No newline at end of file
diff --git a/components/goods-batch-buy/goods-batch-buy.vue b/components/goods-batch-buy/goods-batch-buy.vue
index 7161ff5e..b489bc99 100644
--- a/components/goods-batch-buy/goods-batch-buy.vue
+++ b/components/goods-batch-buy/goods-batch-buy.vue
@@ -1,10 +1,10 @@
-<template>
+<template>
     <view>
         <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event">
             <view class="bg-white">
                 <view class="close oh padding-horizontal-main padding-top-main">
                     <view class="fr" @tap.stop="popup_close_event">
-                        <icon type="clear" size="20"></icon>
+                        <icon type="clear" size="46rpx"></icon>
                     </view>
                 </view>
                 <view class="plugins-batchbuy-container oh">
@@ -90,18 +90,18 @@
                     </block>
                 </view>
             </view>
-        </component-popup>
-    </view>
-</template>
-<script>
+        </component-popup>
+    </view>
+</template>
+<script>
     const app = getApp();
     import base64 from '../../common/js/lib/base64.js';
     import componentPopup from "../../components/popup/popup";
-    import componentBadge from "../../components/badge/badge";
-    export default {
-        data() {
+    import componentBadge from "../../components/badge/badge";
+    export default {
+        data() {
             return {
-                currency_symbol: app.globalData.get_config('currency_symbol', app.globalData.data.currency_symbol),
+                currency_symbol: app.globalData.get_config('currency_symbol', app.globalData.data.currency_symbol),
                 popup_status: false,
                 nav_active_index: 0,
                 goods: null,
@@ -112,19 +112,19 @@
                     kind: 0,
                     quantity: 0,
                     amount_money: '0.00',
-                }
-            };
-        },
-
+                }
+            };
+        },
+
         components: {
             componentPopup,
-            componentBadge
-        },
-
-        created: function() {},
-
-        methods: {
-            // 初始化
+            componentBadge
+        },
+
+        created: function() {},
+
+        methods: {
+            // 初始化
             init(goods = null, batchbuy_data = null, buy_button = null, back_data = null) {
                 if(!app.globalData.is_single_page_check()) {
                     return false;
@@ -135,7 +135,7 @@
                     batchbuy_data: batchbuy_data || null,
                     buy_button: buy_button || null,
                     back_data: back_data,
-                });
+                });
             },
 
             // 弹层关闭
@@ -427,10 +427,10 @@
                         app.globalData.showToast('服务器请求出错');
                     }
                 });
-            }
-        }
-    };
-</script>
+            }
+        }
+    };
+</script>
 <style>
     .plugins-batchbuy-container {
         height: 60vh;
@@ -496,5 +496,5 @@
     }
     .plugins-batchbuy-container .buy-nav-btn-number-4 .item {
         width: 25% !important;
-    }
+    }
 </style>
\ No newline at end of file
diff --git a/components/goods-buy/goods-buy.vue b/components/goods-buy/goods-buy.vue
index 8293b680..7fc24d55 100644
--- a/components/goods-buy/goods-buy.vue
+++ b/components/goods-buy/goods-buy.vue
@@ -1,10 +1,10 @@
-<template>
+<template>
     <view>
         <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event">
             <view class="goods-spec-choice-container padding-main bg-white pr">
                 <view class="close fr oh">
                     <view class="fr" @tap.stop="popup_close_event">
-                        <icon type="clear" size="20"></icon>
+                        <icon type="clear" size="46rpx"></icon>
                     </view>
                 </view>
                 <!-- 规格基础信息 -->
@@ -64,19 +64,19 @@
                     <button v-else class="bg-main br-main cr-white text-size-sm round" type="default" @tap.stop="spec_confirm_event" hover-class="none">确定</button>
                 </block>
             </view>
-        </component-popup>
-    </view>
-</template>
-<script>
+        </component-popup>
+    </view>
+</template>
+<script>
     const app = getApp();
     import base64 from '../../common/js/lib/base64.js';
-    import componentPopup from "../../components/popup/popup";
-    export default {
-        data() {
+    import componentPopup from "../../components/popup/popup";
+    export default {
+        data() {
             return {
                 currency_symbol: app.globalData.get_config('currency_symbol', app.globalData.data.currency_symbol),
                 params: {},
-                back_data: {},
+                back_data: {},
                 popup_status: false,
                 goods_spec_base_price: 0,
                 goods_spec_base_original_price: 0,
@@ -94,18 +94,18 @@
                 // 智能工具插件
                 plugins_intellectstools_config: app.globalData.get_config('plugins_base.intellectstools.data'),
                 plugins_intellectstools_timer: null,
-                plugins_intellectstools_timerout: null,
-            };
-        },
-
+                plugins_intellectstools_timerout: null,
+            };
+        },
+
         components: {
-            componentPopup
-        },
-
-        created: function() {},
-
-        methods: {
-            // 初始化
+            componentPopup
+        },
+
+        created: function() {},
+
+        methods: {
+            // 初始化
             init(goods = {}, params = {}, back_data = null) {
                 if(!app.globalData.is_single_page_check()) {
                     return false;
@@ -164,7 +164,7 @@
                 // 是否直接操作加入购物车
                 if(is_direct_cart) {
                     this.spec_confirm_event();
-                }
+                }
             },
 
             // 默认选中第一个规格
@@ -707,10 +707,10 @@
                         app.globalData.showToast('服务器请求出错');
                     }
                 });
-            }
-        }
-    };
-</script>
+            }
+        }
+    };
+</script>
 <style>
     .goods-spec-choice-container .close {
         position: absolute;
@@ -803,5 +803,5 @@
     }
     .goods-spec-choice-container .buy-nav-btn-number-4 .item {
         width: 25% !important;
-    }
+    }
 </style>
\ No newline at end of file
diff --git a/components/goods-spec-choice/goods-spec-choice.vue b/components/goods-spec-choice/goods-spec-choice.vue
index 13e0eea0..80112daa 100644
--- a/components/goods-spec-choice/goods-spec-choice.vue
+++ b/components/goods-spec-choice/goods-spec-choice.vue
@@ -1,10 +1,10 @@
-<template>
+<template>
     <view>
         <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event">
             <view class="goods-spec-choice-container padding-main bg-white pr">
                 <view class="close fr oh">
                     <view class="fr" @tap.stop="popup_close_event">
-                        <icon type="clear" size="20"></icon>
+                        <icon type="clear" size="46rpx"></icon>
                     </view>
                 </view>
                 <view class="goods-spec-choice-content">
@@ -25,32 +25,32 @@
                 </view>
                 <button class="bg-main br-main cr-white text-size-sm round" type="default" @tap.stop="spec_confirm_event" hover-class="none">确定</button>
             </view>
-        </component-popup>
-    </view>
-</template>
-<script>
+        </component-popup>
+    </view>
+</template>
+<script>
     const app = getApp();
-    import componentPopup from "../../components/popup/popup";
-
-    export default {
-        data() {
-            return {
+    import componentPopup from "../../components/popup/popup";
+
+    export default {
+        data() {
+            return {
                 popup_status: false,
                 goods_id: 0,
                 spec: [],
                 buy_min_number: 1,
-                out_value: ''
-            };
-        },
-
+                out_value: ''
+            };
+        },
+
         components: {
-            componentPopup
-        },
-
-        created: function() {},
-
-        methods: {
-            // 获取数据
+            componentPopup
+        },
+
+        created: function() {},
+
+        methods: {
+            // 获取数据
             init(goods_id, spec, buy_min_number = 1, out_value = '') {
                 this.setData({
                     popup_status: true,
@@ -61,7 +61,7 @@
                 });
                 
                 // 不能选择规格处理
-                this.spec_handle_dont(0, 1);
+                this.spec_handle_dont(0, 1);
             },
 
             // 购买弹层关闭
@@ -307,10 +307,10 @@
                     stock: this.buy_min_number,
                     out_value: this.out_value,
                 });
-            }
-        }
-    };
-</script>
+            }
+        }
+    };
+</script>
 <style>
     .goods-spec-choice-container .close {
         position: absolute;
@@ -351,5 +351,5 @@
     }
     .goods-spec-choice-container .spec-items-disabled image {
         opacity: 0.3;
-    }
+    }
 </style>
\ No newline at end of file
diff --git a/components/quick-nav/quick-nav.vue b/components/quick-nav/quick-nav.vue
index 965a74cc..082286bd 100644
--- a/components/quick-nav/quick-nav.vue
+++ b/components/quick-nav/quick-nav.vue
@@ -12,7 +12,7 @@
             <view :class="'nav-popup-container '+common_ent">
                 <view class="close oh">
                     <view class="icon-right" @tap.stop="quick_close_event">
-                        <icon type="clear" size="20"></icon>
+                        <icon type="clear" size="46rpx"></icon>
                     </view>
                 </view>
                 <view class="nav-popup-content">
diff --git a/components/share-popup/share-popup.vue b/components/share-popup/share-popup.vue
index 979955fc..7f20a420 100644
--- a/components/share-popup/share-popup.vue
+++ b/components/share-popup/share-popup.vue
@@ -1,10 +1,10 @@
-<template>
+<template>
     <view>
         <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event">
             <view class="share-popup bg-white">
                 <view class="close fr oh">
                     <view class="fr" @tap.stop="popup_close_event">
-                        <icon type="clear" size="20"></icon>
+                        <icon type="clear" size="46rpx"></icon>
                     </view>
                 </view>
                 <view class="share-popup-content">
@@ -37,33 +37,33 @@
         </component-popup>
 
         <!-- 用户基础 -->
-        <component-user-base ref="user_base"></component-user-base>
-    </view>
-</template>
-<script>
+        <component-user-base ref="user_base"></component-user-base>
+    </view>
+</template>
+<script>
     const app = getApp();
     var common_static_url = app.globalData.get_static_url('common');
     import componentPopup from "../../components/popup/popup";
-    import componentUserBase from "../../components/user-base/user-base";
-    export default {
-        data() {
+    import componentUserBase from "../../components/user-base/user-base";
+    export default {
+        data() {
             return {
-                common_static_url: common_static_url,
+                common_static_url: common_static_url,
                 popup_status: false,
                 is_goods_poster: 0,
-                goods_id: 0
-            };
-        },
-
+                goods_id: 0
+            };
+        },
+
         components: {
             componentPopup,
-            componentUserBase
-        },
-
-        created: function() {},
-
-        methods: {
-            // 初始配置
+            componentUserBase
+        },
+
+        created: function() {},
+
+        methods: {
+            // 初始配置
             init(config = {}) {
                 if(!app.globalData.is_single_page_check()) {
                     return false;
@@ -77,7 +77,7 @@
                 // 用户头像和昵称设置提示
                 if((this.$refs.user_base || null) != null) {
                     this.$refs.user_base.init('share');
-                }
+                }
             },
 
             // 弹层关闭
@@ -149,9 +149,9 @@
                     }
                 }
             }
-        }
-    };
-</script>
+        }
+    };
+</script>
 <style>
     .share-popup {
         padding: 20rpx 10rpx 0 10rpx;
@@ -191,5 +191,5 @@
     .share-popup-content .share-items .single-text {
         width: calc(100% - 100rpx);
         line-height: 85rpx;
-    }
+    }
 </style>
\ No newline at end of file
diff --git a/components/user-base/user-base.vue b/components/user-base/user-base.vue
index 6491d01b..75f24f51 100644
--- a/components/user-base/user-base.vue
+++ b/components/user-base/user-base.vue
@@ -4,7 +4,7 @@
             <view :class="'user-base-popup bg-white page-bottom-fixed '+(propIsGrayscale ? 'grayscale' : '')">
                 <view class="close fr oh">
                     <view class="fr" @tap.stop="popup_close_event">
-                        <icon type="clear" size="20"></icon>
+                        <icon type="clear" size="46rpx"></icon>
                     </view>
                 </view>
                 <form @submit="form_submit" class="form-container">
diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
index 9ef0f543..32d577f4 100644
--- a/pages/buy/buy.vue
+++ b/pages/buy/buy.vue
@@ -105,7 +105,7 @@
 
                     <!-- 积分 -->
                     <view v-if="(plugins_points_data || null) != null" class="plugins-points-buy-container padding-main border-radius-main bg-white spacing-mb">
-                        <block v-if="(plugins_points_data.discount_price || 0) > 0">
+                        <block v-if="(plugins_points_data.discount_price || 0) > 0">
                             <view class="select oh">
                                 <text v-if="plugins_points_data.discount_type == 1">使用{{plugins_points_data.use_integral}}个积分兑换商品</text>
                                 <text v-else>使用积分{{plugins_points_data.use_integral}}个</text>
@@ -113,16 +113,16 @@
                                 <view @tap="points_event" class="fr cp">
                                     <image class="icon" :src="common_static_url+'select' + (plugins_points_status ? '-active' : '') + '-icon.png'" mode="widthFix"></image>
                                 </view>
-                            </view>
-                            <view class="desc">
-                                <text v-if="plugins_points_data.discount_type == 1">你有积分{{plugins_points_data.user_integral}}个</text>
-                                <text v-else>你有积分{{plugins_points_data.user_integral}}个，可用{{plugins_points_data.use_integral}}个</text>
-                            </view>
-                        </block>
+                            </view>
+                            <view class="desc">
+                                <text v-if="plugins_points_data.discount_type == 1">你有积分{{plugins_points_data.user_integral}}个</text>
+                                <text v-else>你有积分{{plugins_points_data.user_integral}}个，可用{{plugins_points_data.use_integral}}个</text>
+                            </view>
+                        </block>
                         <block v-else>
-                            <view v-if="(plugins_points_data.is_support_goods_exchange || 0) == 1" class="desc tr">
-                                <text>你有积分{{plugins_points_data.user_integral}}个，不足以兑换当前商品</text>
-                            </view>
+                            <view v-if="(plugins_points_data.is_support_goods_exchange || 0) == 1" class="desc tr">
+                                <text>你有积分{{plugins_points_data.user_integral}}个，不足以兑换当前商品</text>
+                            </view>
                         </block>
                     </view>
 
@@ -175,7 +175,7 @@
                 <view class="plugins-coupon-popup bg-base">
                     <view class="close oh">
                         <view class="fr" @tap.stop="plugins_coupon_close_event">
-                            <icon type="clear" size="20"></icon>
+                            <icon type="clear" size="46rpx"></icon>
                         </view>
                     </view>
                     <view v-if="plugins_coupon_list.length > 0" class="plugins-coupon-container padding-horizontal-main padding-bottom-main oh">
@@ -209,7 +209,7 @@
                 <view class="bg-base padding-top-lg">
                     <view class="close oh margin-right-lg padding-bottom-sm">
                         <view class="fr" @tap.stop="plugins_realstore_close_event">
-                            <icon type="clear" size="20"></icon>
+                            <icon type="clear" size="46rpx"></icon>
                         </view>
                     </view>
                     <view class="plugins-realstore-container padding-horizontal-main padding-bottom-main oh">
@@ -244,7 +244,7 @@
     </view>
 </template>
 <script>
-    const app = getApp();
+    const app = getApp();
     import base64 from '../../common/js/lib/base64.js';
     import componentPopup from "../../components/popup/popup";
     import componentNoData from "../../components/no-data/no-data";
@@ -307,15 +307,15 @@
         },
         props: {},
 
-        onLoad(params) {
-            // params.data 参数 urlencode(base64_encode(json字符串))
-            //  buy_type 下单类型（goods 立即购买、cart 购物车）
+        onLoad(params) {
+            // params.data 参数 urlencode(base64_encode(json字符串))
+            //  buy_type 下单类型（goods 立即购买、cart 购物车）
             //  goods_data 下单商品urlencode(base64_encode(json字符串[{goods_id,stock,spec}]))
-            //  params['data'] = '{"buy_type":"goods","goods_data":"W3siZ29vZHNfaWQiOiI5Iiwic3RvY2siOjEsInNwZWMiOlt7InR5cGUiOiLpopzoibIiLCJ2YWx1ZSI6IueyieiJsiJ9LHsidHlwZSI6IuWwuueggSIsInZhbHVlIjoiTCJ9XX1"}';
+            //  params['data'] = '{"buy_type":"goods","goods_data":"W3siZ29vZHNfaWQiOiI5Iiwic3RvY2siOjEsInNwZWMiOlt7InR5cGUiOiLpopzoibIiLCJ2YWx1ZSI6IueyieiJsiJ9LHsidHlwZSI6IuWwuueggSIsInZhbHVlIjoiTCJ9XX1"}';
             //  ids 购物车主键ids
             if ((params.data || null) != null) {
                 this.setData({
-                    params: JSON.parse(base64.decode(decodeURIComponent(params.data))),
+                    params: JSON.parse(base64.decode(decodeURIComponent(params.data))),
                     plugins_points_status: app.globalData.get_config('plugins_base.points.data.is_default_use_points', null) == 1
                 });
 
@@ -349,7 +349,7 @@
                 if ((status || false) == true) {
                     this.setData({
                         currency_symbol: app.globalData.get_config('currency_symbol'),
-                        common_order_is_booking: app.globalData.get_config('config.common_order_is_booking'),
+                        common_order_is_booking: app.globalData.get_config('config.common_order_is_booking'),
                         plugins_points_status: app.globalData.get_config('plugins_base.points.data.is_default_use_points', null) == 1
                     });
                 } else {
@@ -449,8 +449,8 @@
                                     extension_data: data.extension_data || [],
                                     data_list_loding_status: 3,
                                     common_site_type: data.common_site_type || 0,
-                                    extraction_address: data.base.extraction_address || [],
-                                    payment_list: data.payment_list || [],
+                                    extraction_address: data.base.extraction_address || [],
+                                    payment_list: data.payment_list || [],
                                     payment_id: data.default_payment_id || 0,
                                     buy_datetime_info: datetime,
                                     plugins_coupon_data: data.plugins_coupon_data || null,
@@ -800,14 +800,14 @@
             },
 
             // 下单选择时间
-            buy_datetime_event(e) {
-                var temp = this.buy_datetime_info;
-                temp['status'] = !temp.status;
-                if(e != 'open' && e != 'close') {
-                    temp['value'] = (((e || null) != null) ? e._date : '') || '';
-                }
-                this.setData({
-                    buy_datetime_info: temp
+            buy_datetime_event(e) {
+                var temp = this.buy_datetime_info;
+                temp['status'] = !temp.status;
+                if(e != 'open' && e != 'close') {
+                    temp['value'] = (((e || null) != null) ? e._date : '') || '';
+                }
+                this.setData({
+                    buy_datetime_info: temp
                 });
             },
 
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index a6057e96..c7cca1fc 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -395,7 +395,7 @@
 			    <view class="padding-horizontal-main padding-top-main bg-white">
 			        <view class="close oh">
 			            <view class="fr" @tap.stop="popup_params_close_event">
-			                <icon type="clear" size="20"></icon>
+			                <icon type="clear" size="46rpx"></icon>
 			            </view>
 			        </view>
 			        <view class="popup-params-container">
@@ -419,7 +419,7 @@
                 <view class="padding-horizontal-main padding-top-main bg-base">
                     <view class="close oh">
                         <view class="fr" @tap.stop="popup_wholesale_close_event">
-                            <icon type="clear" size="20"></icon>
+                            <icon type="clear" size="46rpx"></icon>
                         </view>
                     </view>
                     <view class="plugins-wholesale-container">
@@ -447,7 +447,7 @@
                 <view class="padding-horizontal-main padding-top-main bg-base">
                     <view class="close oh">
                         <view class="fr" @tap.stop="popup_coupon_close_event">
-                            <icon type="clear" size="20"></icon>
+                            <icon type="clear" size="46rpx"></icon>
                         </view>
                     </view>
                     <view class="plugins-coupon-container padding-bottom-main">
@@ -482,7 +482,7 @@
                 <view class="padding-horizontal-main padding-top-main bg-base">
                     <view class="close oh">
                         <view class="fr" @tap.stop="popup_realstore_close_event">
-                            <icon type="clear" size="20"></icon>
+                            <icon type="clear" size="46rpx"></icon>
                         </view>
                     </view>
                     <view class="plugins-realstore-popup">
@@ -501,7 +501,7 @@
                 <view class="padding-horizontal-main padding-top-main bg-white">
                     <view class="close oh">
                         <view class="fr" @tap.stop="popup_goodsservice_close_event">
-                            <icon type="clear" size="20"></icon>
+                            <icon type="clear" size="46rpx"></icon>
                         </view>
                     </view>
                     <view class="plugins-goodsservice-container">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b8fe7e6a..cfa6f78d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -88,7 +88,7 @@
                                     <component-countdown :propHour="plugins_seckill_data.time.hours" :propMinute="plugins_seckill_data.time.minutes" :propSecond="plugins_seckill_data.time.seconds"></component-countdown>
                                 </view>
                                 <navigator url="/pages/plugins/seckill/index/index" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</navigator>
-                            </view>
+                            </view>
                             <component-goods-list :propData="{style_type: 2, goods_list: plugins_seckill_data.goods}" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol" :propIsCartParaCurve="true" propSource="index"></component-goods-list>
                         </view>
 
@@ -113,15 +113,15 @@
                                 <navigator url="/pages/plugins/shop/index/index" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</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">
-                                <text class="text-wrapper">{{plugins_binding_data.base.home_data_list_title}}</text>
-                                <navigator url="/pages/plugins/binding/index/index" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</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">
+                                <text class="text-wrapper">{{plugins_binding_data.base.home_data_list_title}}</text>
+                                <navigator url="/pages/plugins/binding/index/index" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</navigator>
+                            </view>
+                            <component-binding-list :propConfig="plugins_binding_data.base" :propDataList="plugins_binding_data.data" :propCurrencySymbol="currency_symbol"></component-binding-list>
                         </block>
 
                         <!-- 博客-楼层顶部 - 插件 -->
@@ -154,7 +154,7 @@
                                         </block>
                                     </scroll-view>
                                 </view>
-                                <block v-if="floor.goods.length > 0">
+                                <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>
@@ -210,7 +210,7 @@
                 <!-- 弹屏广告 - 插件 -->
                 <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="20" class="close pa cp" @tap.stop="plugins_popupscreen_close_event"></icon>
+                        <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>
@@ -241,9 +241,9 @@
         <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>
 </template>
@@ -264,9 +264,9 @@
     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 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";
 
     var common_static_url = app.globalData.get_static_url('common');
@@ -338,8 +338,8 @@
                 // 门店插件
                 plugins_realstore_data: null,
                 // 多商户插件
-                plugins_shop_data: null,
-                // 组合搭配插件
+                plugins_shop_data: null,
+                // 组合搭配插件
                 plugins_binding_data: null
             };
         },
@@ -359,9 +359,9 @@
             componentActivityList,
             componentBlogList,
             componentRealstoreList,
-            componentShopList,
-			componentGoodsList,
-            componentUserBase,
+            componentShopList,
+			componentGoodsList,
+            componentUserBase,
             componentBindingList
         },
         props: {},
@@ -371,11 +371,11 @@
             this.init();
 
             // 初始化配置
-            this.init_config();
-
-            // 用户头像和昵称设置提示
-            if((this.$refs.user_base || null) != null) {
-                this.$refs.user_base.init('index');
+            this.init_config();
+
+            // 用户头像和昵称设置提示
+            if((this.$refs.user_base || null) != null) {
+                this.$refs.user_base.init('index');
             }
         },
 
@@ -449,7 +449,7 @@
                                 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_shop_data: data.plugins_shop_data || null,
                                 plugins_binding_data: data.plugins_binding_data || null
                             });
 
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 08d5a6b9..7a2af8ba 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -287,7 +287,7 @@
                     <view class="bg-white padding-horizontal-main padding-top-main">
                         <view class="fr oh">
                             <view class="fr" @tap.stop="popup_image_verify_close_event">
-                                <icon type="clear" size="20"></icon>
+                                <icon type="clear" size="46rpx"></icon>
                             </view>
                         </view>
                         <view class="form-content margin-top-xxxl padding-top-xxl">
diff --git a/pages/plugins/realstore/index/index.vue b/pages/plugins/realstore/index/index.vue
index 21c7741f..58d74ea9 100644
--- a/pages/plugins/realstore/index/index.vue
+++ b/pages/plugins/realstore/index/index.vue
@@ -59,7 +59,7 @@
                 <view class="content bg-white auto padding-xxxl pr radius">
                     <view v-if="(data_base.is_home_choice_location_force || 0) == 0" class="close oh pa">
                         <view @tap="location_tips_close_event">
-                            <icon type="clear" size="20"></icon>
+                            <icon type="clear" size="46rpx"></icon>
                         </view>
                     </view>
                     <view class="padding-lg">
diff --git a/pages/plugins/signin/index-detail/index-detail.vue b/pages/plugins/signin/index-detail/index-detail.vue
index 65e031aa..70c285fb 100644
--- a/pages/plugins/signin/index-detail/index-detail.vue
+++ b/pages/plugins/signin/index-detail/index-detail.vue
@@ -53,7 +53,7 @@
                     <view class="spacing-nav-title">
                         <text class="text-wrapper">推荐商品</text>
                         <navigator url="/pages/goods-search/goods-search" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</navigator>
-                    </view>
+                    </view>
                     <component-goods-list :propData="{style_type: 1, goods_list: data.goods_list}" :propCurrencySymbol="currency_symbol"></component-goods-list>
                 </view>
             </view>
@@ -62,7 +62,7 @@
             <view v-if="is_success_tips == 1" class="coming-tips-container am-text-center">
                 <view class="coming-content tc">
                     <view class="icon-close-submit pa" @tap="coming_success_close_event">
-                        <icon type="clear" size="20"></icon>
+                        <icon type="clear" size="46rpx"></icon>
                     </view>
                     <image :src="static_url+'coming-success-icon.png'" mode="widthFix"></image>
                     <view class="coming-tips-content">
@@ -83,7 +83,7 @@
 <script>
     const app = getApp();
     import componentNoData from "../../../../components/no-data/no-data";
-    import componentBottomLine from "../../../../components/bottom-line/bottom-line";
+    import componentBottomLine from "../../../../components/bottom-line/bottom-line";
     import componentGoodsList from "../../../../components/goods-list/goods-list";
 
     var static_url = app.globalData.get_static_url('signin', true);
@@ -111,7 +111,7 @@
 
         components: {
             componentNoData,
-            componentBottomLine,
+            componentBottomLine,
             componentGoodsList
         },
         props: {},
@@ -222,9 +222,9 @@
             },
 
             // 签到
-            coming_event(e) {
-                if(!app.globalData.is_single_page_check()) {
-                    return false;
+            coming_event(e) {
+                if(!app.globalData.is_single_page_check()) {
+                    return false;
                 }
                 if (this.is_already_coming != 1 && this.init()) {
                     uni.showLoading({
diff --git a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
index 0bdc5948..d003ba1f 100644
--- a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
+++ b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
@@ -21,44 +21,44 @@
                         </view>
                     </navigator>
                 </view>
-            </view>
-
-            <!-- 客服信息 -->
-            <view v-if="(plugins_intellectstools_data || null) != null" class="bg-white padding-main border-radius-main spacing-mb">
-                <view v-if="(plugins_intellectstools_data.service_msg || null) != null" class="cr-red margin-bottom">{{plugins_intellectstools_data.service_msg}}</view>
-                <button type="default" size="mini" class="bg-main br-main cr-white text-size-sm padding-left-xxxl padding-right-xxxl round" @tap="plugins_intellectstools_service_event">
-                    <view class="dis-inline-block va-m margin-right-sm lh-0">
-                        <uni-icons type="chatbubble" size="34rpx" color="#fff"></uni-icons>
-                    </view>
-                    <text>联系客服</text>
-                </button>
-                <view v-if="plugins_intellectstools_service_status" class="plugins-intellectstools-service pa border-radius-main oh bg-white br">
-                    <view v-if="(plugins_intellectstools_data.chat || null) != null" class="item padding-main br-t single-text">
-                        <text class="va-m">客服：</text>
-                        <view class="dis-inline-block chat-info cp" @tap="chat_event">
-                            <image class="dis-inline-block va-m" :src="plugins_intellectstools_data.chat.icon" mode="scaleToFill"></image>
-                            <text class="margin-left-sm va-m cr-blue" :data-value="plugins_intellectstools_data.chat.chat_url">{{plugins_intellectstools_data.chat.name}}</text>
-                        </view>
-                    </view>
-                    <view v-if="(plugins_intellectstools_data.service_qq || null) != null" class="item padding-main br-t single-text">
-                        <text>Q Q：</text>
-                        <text class="cp" @tap="text_copy_event" :data-value="plugins_intellectstools_data.service_qq">{{plugins_intellectstools_data.service_qq}}</text>
-                    </view>
-                    <view v-if="(plugins_intellectstools_data.service_tel || null) != null" class="item padding-main br-t single-text">
-                        <text>电话：</text>
-                        <text class="cp" @tap="tel_event" :data-value="plugins_intellectstools_data.service_tel">{{plugins_intellectstools_data.service_tel}}</text>
-                    </view>
-                    <view v-if="(plugins_intellectstools_data.service_weixin || null) != null || (plugins_intellectstools_data.service_line || null) != null" class="oh qrcode tc br-t">
-                        <view v-if="(plugins_intellectstools_data.service_weixin || null) != null" class="item padding-bottom-lg dis-inline-block">
-                            <image class="radius cp" :src="plugins_intellectstools_data.service_weixin" mode="scaleToFill" @tap="image_show_event" :data-value="plugins_intellectstools_data.service_weixin"></image>
-                            <view>长按微信咨询</view>
-                        </view>
-                        <view v-if="(plugins_intellectstools_data.service_line || null) != null" class="item padding-bottom-lg dis-inline-block">
-                            <image class="radius cp" :src="plugins_intellectstools_data.service_line" mode="scaleToFill" @tap="image_show_event" :data-value="plugins_intellectstools_data.service_line"></image>
-                            <view>长按line咨询</view>
-                        </view>
-                    </view>
-                </view>
+            </view>
+
+            <!-- 客服信息 -->
+            <view v-if="(plugins_intellectstools_data || null) != null" class="bg-white padding-main border-radius-main spacing-mb">
+                <view v-if="(plugins_intellectstools_data.service_msg || null) != null" class="cr-red margin-bottom">{{plugins_intellectstools_data.service_msg}}</view>
+                <button type="default" size="mini" class="bg-main br-main cr-white text-size-sm padding-left-xxxl padding-right-xxxl round" @tap="plugins_intellectstools_service_event">
+                    <view class="dis-inline-block va-m margin-right-sm lh-0">
+                        <uni-icons type="chatbubble" size="34rpx" color="#fff"></uni-icons>
+                    </view>
+                    <text>联系客服</text>
+                </button>
+                <view v-if="plugins_intellectstools_service_status" class="plugins-intellectstools-service pa border-radius-main oh bg-white br">
+                    <view v-if="(plugins_intellectstools_data.chat || null) != null" class="item padding-main br-t single-text">
+                        <text class="va-m">客服：</text>
+                        <view class="dis-inline-block chat-info cp" @tap="chat_event">
+                            <image class="dis-inline-block va-m" :src="plugins_intellectstools_data.chat.icon" mode="scaleToFill"></image>
+                            <text class="margin-left-sm va-m cr-blue" :data-value="plugins_intellectstools_data.chat.chat_url">{{plugins_intellectstools_data.chat.name}}</text>
+                        </view>
+                    </view>
+                    <view v-if="(plugins_intellectstools_data.service_qq || null) != null" class="item padding-main br-t single-text">
+                        <text>Q Q：</text>
+                        <text class="cp" @tap="text_copy_event" :data-value="plugins_intellectstools_data.service_qq">{{plugins_intellectstools_data.service_qq}}</text>
+                    </view>
+                    <view v-if="(plugins_intellectstools_data.service_tel || null) != null" class="item padding-main br-t single-text">
+                        <text>电话：</text>
+                        <text class="cp" @tap="tel_event" :data-value="plugins_intellectstools_data.service_tel">{{plugins_intellectstools_data.service_tel}}</text>
+                    </view>
+                    <view v-if="(plugins_intellectstools_data.service_weixin || null) != null || (plugins_intellectstools_data.service_line || null) != null" class="oh qrcode tc br-t">
+                        <view v-if="(plugins_intellectstools_data.service_weixin || null) != null" class="item padding-bottom-lg dis-inline-block">
+                            <image class="radius cp" :src="plugins_intellectstools_data.service_weixin" mode="scaleToFill" @tap="image_show_event" :data-value="plugins_intellectstools_data.service_weixin"></image>
+                            <view>长按微信咨询</view>
+                        </view>
+                        <view v-if="(plugins_intellectstools_data.service_line || null) != null" class="item padding-bottom-lg dis-inline-block">
+                            <image class="radius cp" :src="plugins_intellectstools_data.service_line" mode="scaleToFill" @tap="image_show_event" :data-value="plugins_intellectstools_data.service_line"></image>
+                            <view>长按line咨询</view>
+                        </view>
+                    </view>
+                </view>
             </view>
 
             <!-- 基础信息 -->
@@ -193,7 +193,7 @@
             <view class="delivery-popup bg-base padding-horizontal-main padding-top-main">
                 <view class="fr oh">
                     <view class="fr" @tap.stop="popup_delivery_close_event">
-                        <icon type="clear" size="20"></icon>
+                        <icon type="clear" size="46rpx"></icon>
                     </view>
                 </view>
                 <view class="margin-top-xxxl padding-top-xxl">
@@ -309,9 +309,9 @@
                 form_number: 0,
                 form_images_list: [],
                 form_express_name: '',
-                form_express_number: '',
-                // 智能工具插件、客服信息展示
-                plugins_intellectstools_data: null,
+                form_express_number: '',
+                // 智能工具插件、客服信息展示
+                plugins_intellectstools_data: null,
                 plugins_intellectstools_service_status: false
             };
         },
@@ -379,7 +379,7 @@
                                 return_money_goods_reason: data.return_money_goods_reason || [],
                                 aftersale_type_list: data.aftersale_type_list || [],
                                 return_goods_address: data.return_goods_address || null,
-                                form_price: data.returned_data || null != null ? data.returned_data.refund_price : 0,
+                                form_price: data.returned_data || null != null ? data.returned_data.refund_price : 0,
                                 plugins_intellectstools_data: data.plugins_intellectstools_data || null
                             });
                         } else {
@@ -718,33 +718,33 @@
                 uni.navigateTo({
                     url: "/pages/user-orderaftersale/user-orderaftersale?keywords=" + this.new_aftersale_data.order_no
                 });
-            },
-
-            // 客服事件
-            plugins_intellectstools_service_event(e) {
-                this.setData({
-                    plugins_intellectstools_service_status: !this.plugins_intellectstools_service_status
-                });
-            },
-
-            // 客服电话
-            tel_event(e) {
-                app.globalData.call_tel(e.currentTarget.dataset.value);
-            },
-
-            // 剪切板
-            text_copy_event(e) {
-                app.globalData.text_copy_event(e);
-            },
-
-            // 图片预览
-            image_show_event(e) {
-                app.globalData.image_show_event(e);
-            },
-
-            // 进入客服系统
-            chat_event() {
-                app.globalData.chat_entry_handle(this.plugins_intellectstools_data.chat.chat_url);
+            },
+
+            // 客服事件
+            plugins_intellectstools_service_event(e) {
+                this.setData({
+                    plugins_intellectstools_service_status: !this.plugins_intellectstools_service_status
+                });
+            },
+
+            // 客服电话
+            tel_event(e) {
+                app.globalData.call_tel(e.currentTarget.dataset.value);
+            },
+
+            // 剪切板
+            text_copy_event(e) {
+                app.globalData.text_copy_event(e);
+            },
+
+            // 图片预览
+            image_show_event(e) {
+                app.globalData.image_show_event(e);
+            },
+
+            // 进入客服系统
+            chat_event() {
+                app.globalData.chat_entry_handle(this.plugins_intellectstools_data.chat.chat_url);
             }
         }
     };