diff --git a/public/components/admin/addMarketText/addMarketText.html b/public/components/admin/addMarketText/addMarketText.html
index 1123f8345..e5408980d 100644
--- a/public/components/admin/addMarketText/addMarketText.html
+++ b/public/components/admin/addMarketText/addMarketText.html
@@ -41,6 +41,18 @@
                                         :placeholder="vc.i18n('必填，请填写文本内容','addMarketText')" class="form-control"></textarea>
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span>
+                                        <vc:i18n name='营销配置' namespace='addMarketText'></vc:i18n>
+                                    </span></label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addMarketTextInfo.smsId">
+                                        <option selected disabled value="">{{vc.i18n('必填，请选择营销配置','addMarketText')}}
+                                        </option>
+                                        <option :value="item.smsId" v-for="(item,index) in addMarketTextInfo.marketSmss">{{item.smsName}}</option>
+                                    </select>
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
diff --git a/public/components/admin/addMarketText/addMarketText.js b/public/components/admin/addMarketText/addMarketText.js
index 491ff8f98..03fce3455 100644
--- a/public/components/admin/addMarketText/addMarketText.js
+++ b/public/components/admin/addMarketText/addMarketText.js
@@ -11,7 +11,8 @@
                 name: '',
                 sendRate: '',
                 textContent: '',
-
+                smsId:'',
+                marketSmss:[]
             }
         },
         _initMethod: function () {
@@ -20,6 +21,7 @@
         _initEvent: function () {
             vc.on('addMarketText', 'openAddMarketTextModal', function () {
                 $('#addMarketTextModel').modal('show');
+                $that._listAddMarketSms();
             });
         },
         methods: {
@@ -103,9 +105,28 @@
                     name: '',
                     sendRate: '',
                     textContent: '',
-
+                    smsId:'',
+                    marketSmss:[]
                 };
-            }
+            },
+            _listAddMarketSms: function (_page, _rows) {
+                let param = {
+                    params: {
+                        page:1,
+                        row:100
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/marketSms.listMarketSms',
+                    param,
+                    function (json, res) {
+                        let _marketSms = JSON.parse(json);
+                        $that.addMarketTextInfo.marketSmss = _marketSms.data;
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
         }
     });
 
diff --git a/public/components/admin/editMarketText/editMarketText.html b/public/components/admin/editMarketText/editMarketText.html
index 797854637..22d29ebbd 100644
--- a/public/components/admin/editMarketText/editMarketText.html
+++ b/public/components/admin/editMarketText/editMarketText.html
@@ -41,6 +41,18 @@
                                         :placeholder="vc.i18n('必填，请填写文本内容','editMarketText')" class="form-control"></textarea>
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span>
+                                        <vc:i18n name='营销配置' namespace='editMarketText'></vc:i18n>
+                                    </span></label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editMarketTextInfo.smsId">
+                                        <option selected disabled value="">{{vc.i18n('必填，请选择营销配置','editMarketText')}}
+                                        </option>
+                                        <option :value="item.smsId" v-for="(item,index) in editMarketTextInfo.marketSmss">{{item.smsName}}</option>
+                                    </select>
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
diff --git a/public/components/admin/editMarketText/editMarketText.js b/public/components/admin/editMarketText/editMarketText.js
index 3120d0f3f..5359101c1 100644
--- a/public/components/admin/editMarketText/editMarketText.js
+++ b/public/components/admin/editMarketText/editMarketText.js
@@ -7,6 +7,8 @@
                 name: '',
                 sendRate: '',
                 textContent: '',
+                marketSmss:[],
+                smsId:''
             }
         },
         _initMethod: function () {
@@ -17,6 +19,7 @@
                 vc.component.refreshEditMarketTextInfo();
                 $('#editMarketTextModel').modal('show');
                 vc.copyObject(_params, vc.component.editMarketTextInfo);
+                $that._listEditMarketSms();
             });
         },
         methods: {
@@ -104,9 +107,29 @@
                     name: '',
                     sendRate: '',
                     textContent: '',
+                    marketSmss:[],
+                    smsId:''
 
                 }
-            }
+            },
+            _listEditMarketSms: function (_page, _rows) {
+                let param = {
+                    params: {
+                        page:1,
+                        row:100
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/marketSms.listMarketSms',
+                    param,
+                    function (json, res) {
+                        let _marketSms = JSON.parse(json);
+                        $that.editMarketTextInfo.marketSmss = _marketSms.data;
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
         }
     });
 
diff --git a/public/components/admin/marketWayText/marketWayText.html b/public/components/admin/marketWayText/marketWayText.html
index b2a02ceb3..cad54a3c8 100644
--- a/public/components/admin/marketWayText/marketWayText.html
+++ b/public/components/admin/marketWayText/marketWayText.html
@@ -1,7 +1,8 @@
 <div class="margin-top">
     <div class="row margin-top-lg">
         <div class="col-lg-2 padding-right-xs padding-left-xl">
-            <input v-model="marketWayTextInfo.conditions.name" type="text" :placeholder="vc.i18n('请填写名称','addMarketText')" class="form-control">
+            <input v-model="marketWayTextInfo.conditions.name" type="text"
+                :placeholder="vc.i18n('请填写名称','addMarketText')" class="form-control">
 
         </div>
         <div class="col-lg-2 padding-right-xs padding-left-xl">
@@ -20,7 +21,9 @@
             </button>
             <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddMarketTextModal()">
                 <i class="glyphicon glyphicon-plus"></i>
-                <span><vc:i18n name="添加"  namespace="marketTextManage"></vc:i18n></span>
+                <span>
+                    <vc:i18n name="添加" namespace="marketTextManage"></vc:i18n>
+                </span>
             </button>
         </div>
     </div>
@@ -28,9 +31,9 @@
         <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
             <thead>
                 <tr>
-                    <th class="text-center"><span>
+                    <!-- <th class="text-center"><span>
                             <vc:i18n name='编号' namespace='marketWayText'></vc:i18n>
-                        </span></th>
+                        </span></th> -->
                     <th class="text-center"><span>
                             <vc:i18n name='名称' namespace='marketWayText'></vc:i18n>
                         </span></th>
@@ -40,6 +43,12 @@
                     <th class="text-center"><span>
                             <vc:i18n name='内容' namespace='marketWayText'></vc:i18n>
                         </span></th>
+                    <th class="text-center"><span>
+                            <vc:i18n name='营销配置' namespace='marketWayText'></vc:i18n>
+                        </span></th>
+                    <th class="text-center"><span>
+                            <vc:i18n name='创建时间' namespace='marketWayText'></vc:i18n>
+                        </span></th>
                     <th class="text-center"><span>
                             <vc:i18n name='操作'></vc:i18n>
                         </span></th>
@@ -47,10 +56,13 @@
             </thead>
             <tbody>
                 <tr v-for="marketText in marketWayTextInfo.marketTexts">
-                    <td class="text-center">{{marketText.textId}}</td>
+                    <!-- <td class="text-center">{{marketText.textId}}</td> -->
                     <td class="text-center">{{marketText.name}}</td>
-                    <td class="text-center">{{marketText.sendRate}}</td>
+                    <td class="text-center">{{marketText.sendRateName}}</td>
                     <td class="text-center">{{marketText.textContent}}</td>
+                    <td class="text-center">{{marketText.smsName}}</td>
+                    <td class="text-center">{{marketText.createTime}}</td>
+
                     <td class="text-center">
                         <div class="btn-group">
                             <button class="btn-white btn btn-xs"