diff --git a/src/api/ebiz/productionSay/productionSay.js b/src/api/ebiz/productionSay/productionSay.js
new file mode 100644
index 000000000..d2c4f060b
--- /dev/null
+++ b/src/api/ebiz/productionSay/productionSay.js
@@ -0,0 +1,38 @@
+import request from '@/assets/js/utils/request'
+import getUrl from '@/assets/js/utils/get-url'
+
+// // 获取商品商城列表
+export function getShopList(data) {
+  return request({
+    url: getUrl('/customer/shop/getShopList', 1),
+    method: 'post',
+    data
+  })
+}
+
+// 查询分享轨迹(转发记录)
+export function getShareList(data) {
+  return request({
+    url: getUrl('/customer/shop/getShareList', 1),
+    method: 'post',
+    data
+  })
+}
+
+// 分享轨迹保存
+export function saveShareTrack(data) {
+  return request({
+    url: getUrl('/customer/shop/saveShareTrack', 1),
+    method: 'post',
+    data
+  })
+}
+
+// 获取账号密码以用于回显
+export function getPassword(data) {
+  return request({
+    url: getUrl('/customer/shop/getPassword', 1),
+    method: 'post',
+    data 
+  })
+}
diff --git a/src/assets/js/utils/orgShortName.js b/src/assets/js/utils/orgShortName.js
index 342c562ed..cada58add 100644
--- a/src/assets/js/utils/orgShortName.js
+++ b/src/assets/js/utils/orgShortName.js
@@ -30,5 +30,6 @@ export const orgShortNames = [
   { name: '玉林一营', code: '86450961' },
   { name: '南宁横县', code: '86450105' },
   { name: '桂林荔浦', code: '86450303' },
-  { name: '贵港桂平', code: '86450803' }
+  { name: '贵港桂平', code: '86450803' },
+  { name: '来宾', code: '86451301' }
 ]
diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js
index f229d13f6..159764b8a 100644
--- a/src/assets/js/utils/request.js
+++ b/src/assets/js/utils/request.js
@@ -99,8 +99,11 @@ let performanceRanking = ['/data/performance/getComList', '/data/performance/get
 let hgb = ['/sale/order/selectHgb', '/sale/order/getHgbDetail']
 let whitelist = ['/agent/white/getWhiteInfo']
 
+<<<<<<< HEAD
 // 开门红
 let goodStart = ['/data/performance/getComPerformance']
+=======
+>>>>>>> feature/GFRS-2266【需求】产说会需求
 let eqiVisit = [
   '/agent/accompany/getAccompanyComCode',
   '/agent/accompany/getAccompanyPerson',
@@ -125,7 +128,10 @@ let whiteList = [
   ...performanceRanking,
   ...hgb,
   ...whitelist,
+<<<<<<< HEAD
   ...goodStart,
+=======
+>>>>>>> feature/GFRS-2266【需求】产说会需求
   ...eqiVisit
 ]
 
diff --git a/src/router/ebiz/index.js b/src/router/ebiz/index.js
index 99074cc60..9cb0b54cb 100644
--- a/src/router/ebiz/index.js
+++ b/src/router/ebiz/index.js
@@ -33,7 +33,14 @@ import eqiVisit from './eqiVisit'
 
 // 重新投保
 import insureAgain from './insureAgain'
+import train from './train'
+import renewalManage from './renewalManage'
+import question from './question'
+import hgb from './hgb'
+import eqiVisit from './eqiVisit'
 
+// 产说会
+import productionSay from './productionSay'
 export default [
   ...proposal,
   ...sale,
@@ -60,8 +67,14 @@ export default [
   ...renewalManage,
   ...question,
   ...hgb,
+  ...train,
   ...goodStart,
+<<<<<<< HEAD
   ...train,
   ...eqiVisit,
   ...insureAgain
+=======
+  ...eqiVisit,
+  ...productionSay
+>>>>>>> feature/GFRS-2266【需求】产说会需求
 ] //根据需要进行删减
diff --git a/src/router/ebiz/productionSay.js b/src/router/ebiz/productionSay.js
new file mode 100644
index 000000000..5a70c1709
--- /dev/null
+++ b/src/router/ebiz/productionSay.js
@@ -0,0 +1,44 @@
+//产品列表 定义相关组件
+const productList = () => import('@/views/ebiz/product/ProductList')
+const productDetail = () => import('@/views/ebiz/product/ProductDetail')
+const productDocument = () => import('@/views/ebiz/product/ProductDocument')
+const homeProduct = () => import('@/views/ebiz/product/HomeProduct')
+
+export default [
+  {
+    path: '/product/productList',
+    name: 'productList',
+    component: productList,
+    meta: {
+      title: '产品列表',
+      index: 1
+    }
+  },
+  {
+    path: '/product/productDetail/:productDetailCode',
+    name: 'productDetail',
+    component: productDetail,
+    meta: {
+      title: '产品详情',
+      index: 2
+    }
+  },
+  {
+    path: '/product/productDocument',
+    name: 'productDocument',
+    component: productDocument,
+    meta: {
+      title: '产品资料',
+      index: 3
+    }
+  },
+  {
+    path: '/product/homeProduct',
+    name: 'homeProduct',
+    component: homeProduct,
+    meta: {
+      title: '首页产品',
+      index: 4
+    }
+  }
+]
diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 04ceefd5d..2b5f3f8a2 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -1583,6 +1583,7 @@ export default {
               this.getTrial()
             }
           }
+<<<<<<< HEAD
         } else if (this.saleInsuredPersonInfo.age >= 0 && this.saleInsuredPersonInfo.age <= 40) {
           //使用rules规则里的第一条控制保额份数
           if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
@@ -1620,6 +1621,8 @@ export default {
               this.getTrial()
             }
           }
+=======
+>>>>>>> feature/GFRS-2266【需求】产说会需求
         } else if (this.saleInsuredPersonInfo.age >= 0 && this.saleInsuredPersonInfo.age <= 40) {
           //使用rules规则里的第一条控制保额份数
           if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
diff --git a/src/views/ebiz/productionSay/List.vue b/src/views/ebiz/productionSay/List.vue
new file mode 100644
index 000000000..a56fa14aa
--- /dev/null
+++ b/src/views/ebiz/productionSay/List.vue
@@ -0,0 +1,12 @@
+<template>
+    <div>
+
+    </div>
+</template>
+
+<script>
+export default {
+    name:'List',
+
+}
+</script>
\ No newline at end of file