diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 2dba41ba..14e0fd65 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -49,7 +49,7 @@
             <scroll-view :scroll-y="true" :class="'scroll-box ' + (data_list.length > 0 ? 'cart ' : '')" @scrolltolower="scroll_lower" lower-threshold="60" :style="scroll_style">
                 <view class="content">
                     <!-- 数据列表 -->
-                    <view v-if="data_list.length > 0" class="padding-horizontal-main padding-bottom-xsss">
+                    <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main padding-bottom-xsss">
                         <uni-swipe-action ref="swipe_action">
                             <view v-for="(item, index) in data_list" :key="index" class="oh border-radius-main bg-white spacing-mb">
                                 <uni-swipe-action-item :right-options="swipe_options" @click="swipe_opt_event" @change="swipe_change($event, index)">
@@ -1446,7 +1446,7 @@
         padding-bottom: 60rpx;
     }
     .scroll-box.cart .content {
-        padding-bottom: calc(180rpx + env(safe-area-inset-bottom));
+        padding-bottom: calc(210rpx + env(safe-area-inset-bottom));
     }
     .cart-goods-title {
         line-height: 44rpx;
diff --git a/locale/en.json b/locale/en.json
index 4e85e410..8db199ec 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -63,6 +63,7 @@
 		"view_text": "Check",
         "detail_text": "Detail",
         "refresh_text": "Refresh",
+        "feed_text": "Feed",
         "yes_text": "Yes",
         "no_text": "NO",
         "wait": "Wait",
@@ -317,12 +318,14 @@
         "plugins-certificate-userauth-saveinfo": "Certificate editor",
         "plugins-certificate-userauth-detail": "Certificate detail",
         "plugins-goodscompare-index": "Goods Compare",
-        "plugins-complaint-user": "Complaint/Report List",
-        "plugins-complaint-form": "Complaint/Report",
         "plugins-video-index": "Short Video List",
         "plugins-video-search": "Short video search",
         "plugins-video-detail": "Short video details",
-        "plugins-live-pull": "Live Details"
+        "plugins-live-pull": "Live Details",
+        "plugins-complaint-user": "Complaint/Report List",
+        "plugins-complaint-form": "Complaint/Report",
+        "plugins-orderfeed-user": "Feed List",
+        "plugins-orderfeed-form": "Feed Data"
 	},
 	"login": {
 		"login": {
diff --git a/locale/zh.json b/locale/zh.json
index 2cfe01eb..87f98404 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -63,6 +63,7 @@
 		"view_text": "查看",
         "detail_text": "详情",
         "refresh_text": "刷新",
+        "feed_text": "反馈",
         "yes_text": "是",
         "no_text": "否",
         "wait": "待",
@@ -315,12 +316,14 @@
         "plugins-certificate-userauth-saveinfo": "资质认证编辑",
         "plugins-certificate-userauth-detail": "资质认证详情",
         "plugins-goodscompare-index": "商品对比",
-        "plugins-complaint-user": "投诉/举报列表",
-        "plugins-complaint-form": "投诉/举报",
         "plugins-video-index": "短视频列表",
         "plugins-video-search": "短视频搜索",
         "plugins-video-detail": "短视频详情",
-        "plugins-live-pull": "直播详情"
+        "plugins-live-pull": "直播详情",
+        "plugins-complaint-user": "投诉/举报列表",
+        "plugins-complaint-form": "投诉/举报",
+        "plugins-orderfeed-user": "反馈数据列表",
+        "plugins-orderfeed-form": "反馈数据"
         
 	},
 	"login": {
diff --git a/pages.json b/pages.json
index 07a87366..7d86918f 100644
--- a/pages.json
+++ b/pages.json
@@ -2173,6 +2173,25 @@
                     }
                 }
             ]
+        },
+        {
+            "root": "pages/plugins/orderfeed",
+            "pages": [
+                {
+                    "path": "form/form",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "user/user",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
         }
     ],
     "preloadRule": {
diff --git a/pages/plugins/orderfeed/form/form.css b/pages/plugins/orderfeed/form/form.css
new file mode 100644
index 00000000..f4e1b1cf
--- /dev/null
+++ b/pages/plugins/orderfeed/form/form.css
@@ -0,0 +1,8 @@
+.business .cover {
+    width: 160rpx;
+    height: 160rpx;
+}
+.business .base {
+    width: calc(100% - 180rpx);
+    height: 76rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/orderfeed/form/form.vue b/pages/plugins/orderfeed/form/form.vue
new file mode 100644
index 00000000..a8704c84
--- /dev/null
+++ b/pages/plugins/orderfeed/form/form.vue
@@ -0,0 +1,266 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data_list_loding_status !== 1">
+            <form v-if="(item || null) != null" @submit="form_submit" class="form-container">
+                <view class="page-bottom-fixed padding-main">
+                    <view class="business bg-white padding-main border-radius-main flex-row gap-10 pr spacing-mb" :data-value="item.goods_url" @tap="url_event">
+                        <image :src="item.images" mode="aspectFit" class="cover br-f5 radius"></image>
+                        <view class="base">
+                            <view class="multi-text">{{item.title}}</view>
+                            <view v-if="(item.spec_text || null) != null" class="cr-grey margin-top-xs">{{item.spec_text}}</view>
+                            <text v-if="(order || null) != null && (order.items || null) != null && order.items.length > 1" class="cr-blue cp pa right-0 bottom-0 padding" @tap.stop="order_goods_back_event">选择其他商品 >></text>
+                        </view>
+                    </view>
+                    <view class="form-gorup border-radius-main spacing-mb">
+                        <view class="form-gorup-title padding-right-main">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.87tuff')}}<text class="form-group-tips-must">*</text></view>
+                        <textarea name="describe" placeholder-class="cr-grey-9" class="cr-base" :placeholder="$t('user-orderaftersale-detail.user-orderaftersale-detail.6uygft')" maxlength="230" :value="data.describe || ''"></textarea>
+                    </view>
+                    <view class="form-gorup border-radius-main">
+                        <view class="form-gorup-title padding-right-main">{{$t('common.image')}}<text class="form-group-tips">{{$t('complaint-form.complaint-form.56ys33')}}</text></view>
+                        <view class="margin-top-main">
+                            <component-upload :propData="data.images" :propMaxNum="10" :propPathType="editor_path_type" @call-back="retrun_image_event"></component-upload>
+                        </view>
+                    </view>
+                    <view v-if="(tips || null) != null" class="bg-white oh padding-main border-radius-main cr-red spacing-mt">
+                        <view>{{tips.title}}</view>
+                        <view v-if="(tips.msg || null) != null" class="margin-top-sm">{{tips.msg}}</view>
+                    </view>
+                </view>
+                <!-- 底部操作 -->
+                <view class="bottom-fixed" :style="bottom_fixed_style">
+                    <view class="bottom-line-exclude">
+                        <view v-if="(user || null) != null && params.is_list != 0" class="tr padding-bottom-lg padding-right-sm">
+                            <text class="cr-blue cp" @tap="url_event" data-value="/pages/plugins/orderfeed/user/user">{{$t('complaint-form.complaint-form.ssdff4')}} >></text>
+                        </view>
+                        <button class="item cr-white bg-main round text-size wh-auto" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">{{$t('common.submit')}}</button>
+                    </view>
+                </view>
+            </form>
+            <view v-else>
+                <view v-if="(order || null) != null && (order.items || null) != null && order.items.length > 0" class="business padding-main">
+                    <block v-for="(item, index) in order.items" :key="index">
+                        <view class="bg-white padding-main border-radius-main spacing-mb flex-row gap-10 pr" :data-value="item.goods_url" @tap="url_event">
+                            <image :src="item.images" mode="aspectFit" class="cover br-f5 radius"></image>
+                            <view class="base">
+                                <view class="multi-text">{{item.title}}</view>
+                                <view v-if="(item.spec_text || null) != null" class="cr-grey margin-top-xs">{{item.spec_text}}</view>
+                                <text class="cr-blue cp pa right-0 bottom-0 padding" :data-index="index" @tap.stop="order_goods_use_event">反馈该商品 >></text>
+                            </view>
+                        </view>
+                    </block>
+                </view>
+                <block v-else>
+                    <component-no-data propStatus="0"></component-no-data>
+                </block>
+            </view>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    import componentUpload from '@/components/upload/upload';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                data_list_loding_status: 1,
+                bottom_fixed_style: '',
+                params: {},
+                user: null,
+                data: {},
+                order: null,
+                item: null,
+                tips: null,
+                editor_path_type: '',
+                form_submit_loading: false,
+                is_complaint_app_login: false,
+            };
+        },
+        components: {
+            componentCommon,
+            componentUpload,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+                user: app.globalData.get_user_cache_info() || null,
+            });
+
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            // 数据加载
+            this.get_data();
+        },
+
+        // 页面销毁时执行
+        onUnload: function () {},
+
+        methods: {
+            // 获取数据
+            get_data() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('saveinfo', 'userfeed', 'orderfeed'),
+                    method: 'POST',
+                    data: this.params,
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data || {};
+                            this.setData({
+                                data: data.data || {},
+                                order: data.order || null,
+                                item: data.item || null,
+                                tips: data.tips || null,
+                                editor_path_type: data.editor_path_type,
+                                data_list_loding_status: 3,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 订单商品使用事件
+            order_goods_use_event(e) {
+                var item = this.order.items[e.currentTarget.dataset.index];
+                this.setData({
+                    params: {...this.params, ...{odid: item.id}},
+                });
+                this.get_data();
+            },
+
+            // 订单商品返回事件
+            order_goods_back_event(e) {
+                this.setData({
+                    params: {...this.params, ...{odid: 0}},
+                });
+                this.get_data();
+            },
+
+            // 上传回调
+            retrun_image_event(res) {
+                var temp_data = this.data;
+                temp_data['images'] = res;
+                this.setData({
+                    data: temp_data,
+                });
+            },
+
+            // 表单提交
+            form_submit(e) {
+                // 是否需要登录
+                if(this.is_complaint_app_login) {
+                    var user = app.globalData.get_user_info(this, 'form_submit', e);
+                    if (user == false) {
+                        return;
+                    }
+                }
+                // 数据验证
+                var validation = [
+                    { fields: 'describe', msg: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.6uygft') },
+                ];
+                var form_data = {...this.data, ...this.params};
+                    form_data['describe'] = e.detail.value.describe;
+                if (app.globalData.fields_check(form_data, validation)) {
+                    if((this.item || null) != null) {
+                        form_data['oid'] = this.item.order_id || 0;
+                        form_data['odid'] = this.item.id || 0;
+                    }
+                    uni.showLoading({
+                        title: this.$t('common.submit_in_text'),
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    // 网络请求
+                    uni.request({
+                        url: app.globalData.get_request_url('save', 'userfeed', 'orderfeed'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.page_back_prev_event();
+                                }, 2000);
+                            } else {
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './form.css';
+</style>
diff --git a/pages/plugins/orderfeed/user/user.css b/pages/plugins/orderfeed/user/user.css
new file mode 100644
index 00000000..6d001efd
--- /dev/null
+++ b/pages/plugins/orderfeed/user/user.css
@@ -0,0 +1,10 @@
+.goods-cover {
+    width: 120rpx;
+    height: 120rpx;
+}
+.goods-base {
+    width: calc(100% - 140rpx);
+}
+.goods-base .multi-text {
+    height: 76rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/orderfeed/user/user.vue b/pages/plugins/orderfeed/user/user.vue
new file mode 100644
index 00000000..34857adf
--- /dev/null
+++ b/pages/plugins/orderfeed/user/user.vue
@@ -0,0 +1,422 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white flex-row jc-sa align-c">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <text>{{item.add_time}}</text>
+                        <text class="fr cr-main">{{ item.status_name }}</text>
+                    </view>
+                    <view v-if="(item.goods_title || null) != null" class="oh margin-top flex-row gap-5" :data-value="item.goods_url" @tap="url_event">
+                        <image v-if="(item.goods_images || null) != null" :src="item.goods_images" mode="aspectFill" class="br-f5 radius goods-cover"></image>
+                        <view :class="(item.goods_images || null) != null ? 'goods-base' : ''">
+                            <view class="multi-text">{{item.goods_title}}</view>
+                            <view v-if="(item.goods_spec || null) != null" class="cr-grey margin-top-xs">{{item.goods_spec}}</view>
+                        </view>
+                    </view>
+                    <view class="content margin-top-main">
+                        <component-panel-content :propData="item" :propDataField="field_list" propExcludeField="add_time,status_name" propClass="" :propIsTerse="true"></component-panel-content>
+                    </view>
+                    <view v-if="item.status == 0 || item.status != 1" class="item-operation tr br-t padding-top-main margin-top-main">
+                        <block v-if="item.status == 0 || item.status == 2">
+                            <button class="round bg-white cr-green br-green" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/orderfeed/form/form?oid='+item.order_id+'&odid='+item.order_detail_id+'&is_list=0'" hover-class="none">{{$t('common.edit')}}</button>
+                            <button class="round bg-white cr-yellow br-yellow" type="default" size="mini" @tap="cancel_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.cancel')}}</button>
+                        </block>
+                        <button v-if="item.status != 1" class="round bg-white cr-red br-red" type="default" size="mini" @tap="delete_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.del')}}</button>
+                    </view>
+                </view>
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </view>
+            <block v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </block>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentPanelContent from "@/components/panel-content/panel-content";
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: {},
+                field_list: [],
+                is_complaint_app: false,
+            };
+        },
+        components: {
+            componentCommon,
+            componentPanelContent,
+            componentNoData,
+            componentBottomLine
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 参数处理
+            params = app.globalData.launch_params_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]['value'] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+            this.init();
+        },
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            app.globalData.init_config(0, this, 'init_config');
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    var complaint_config = app.globalData.get_config('plugins_base.complaint.data') || {};
+                    this.setData({
+                        is_complaint_app: parseInt(complaint_config.is_complaint_app || 0) == 1,
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 初始化
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取公共数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('init', 'userfeed', 'orderfeed'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                nav_status_list: data.nav_status_list || [],
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: false,
+                                data_page: 1,
+                            });
+                            this.get_data_list();
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 列表数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+                
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 请求数据
+                var data = {...this.params, ...{
+                    page: this.data_page,
+                }};
+
+                // 状态
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]['value'];
+                if (status != -1) {
+                    data['status'] = status;
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'userfeed', 'orderfeed'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data_list.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data_list;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data_list;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.data_total,
+                                    data_page_total: data.page_total,
+                                    field_list: data.field_list || [],
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_list.length > 0 && this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+            
+            // 取消
+            cancel_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('common.cancel_confirm_tips'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('common.no'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('cancel', 'userfeed', 'orderfeed'),
+                                method: 'POST',
+                                data: {
+                                    ids: id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list[index]['status'] = 2;
+                                        temp_data_list[index]['status_name'] = this.$t('order.order.1k98tk');
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 删除
+            delete_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('common.delete_confirm_tips'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('common.no'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('delete', 'userfeed', 'orderfeed'),
+                                method: 'POST',
+                                data: {
+                                    ids: id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list.splice(index, 1);
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        if (temp_data_list.length == 0) {
+                                            this.setData({
+                                                data_list_loding_status: 0,
+                                                data_bottom_line_status: false,
+                                            });
+                                        }
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './user.css';
+</style>
\ No newline at end of file
diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue
index be60bd15..c64780bb 100644
--- a/pages/user-order/user-order.vue
+++ b/pages/user-order/user-order.vue
@@ -69,7 +69,8 @@
                                     (item.plugins_is_order_frequencycard_button || 0) +
                                     (item.plugins_delivery_data || 0) +
                                     (item.plugins_ordergoodsform_data || 0) +
-                                    (item.plugins_orderresources_data || 0)
+                                    (item.plugins_orderresources_data || 0) +
+                                    (item.plugins_is_orderfeed_button || 0)
                                  > 0 ) ||
                                 (item.status == 2 && item.order_model != 2) ||
                                 ((item.plugins_express_data || 0) == 1 && (item.express_data || null) != null) ||
@@ -89,7 +90,8 @@
                             <button v-if="(item.plugins_is_order_frequencycard_button || 0) == 1" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/realstore/frequencycard-list/frequencycard-list?oid=' + item.id" hover-class="none">{{$t('orderallot-list.orderallot-list.b13k5r')}}</button>
                             <button v-if="(item.plugins_ordergoodsform_data || 0) == 1" class="round bg-white cr-blue br-blue margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/ordergoodsform/order/order?id=' + item.id" hover-class="none">{{$t('user-order.user-order.9l47b6')}}</button>
                             <button v-if="(item.plugins_orderresources_data || 0) == 1" class="round bg-white cr-blue br-blue margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/orderresources/orderannex/orderannex?oid=' + item.id" hover-class="none">{{$t('user-order.user-order.fyuikn')}}</button>
-                            <button v-if="(item.plugins_intellectstools_data || null) != null && (item.plugins_intellectstools_data.continue_buy_data || null) != null && item.plugins_intellectstools_data.continue_buy_data.length > 0" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" :data-index="index" @tap="continue_buy_event" hover-class="none">{{$t('user-order.user-order.3l2jr5')}}</button>
+                            <button v-if="(item.plugins_is_orderfeed_button || 0) == 1" class="round bg-white cr-blue br-blue margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/orderfeed/form/form?oid=' + item.id" hover-class="none">{{$t('common.feed_text')}}</button>
+                            <button v-if="(item.plugins_intellectstools_data || null) != null && (item.plugins_intellectstools_data.continue_buy_data || null) != null && item.plugins_intellectstools_data.continue_buy_data.length > 0" class="round bg-white cr-base br-base margin-bottom-main" type="default" size="mini" :data-index="index" @tap="continue_buy_event" hover-class="none">{{$t('user-order.user-order.3l2jr5')}}</button>
                         </view>
                     </view>
                     <!-- 结尾 -->