Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev

src/views/ebiz/my/UserIncome.vue

@@ -31,7 +31,7 @@
       </van-row>
     </van-sticky>
 
-    <!-- 输入具体内容 -->
+    <!-- 收入具体内容 -->
     <div class="moneyContent" v-if="list.length !== 0">
       <div class="payRoll" v-for="item in list" :key="item.payRollCode">
         <div class="payRollName">{{ item.payRollName }}</div>
@@ -40,9 +40,14 @@
     </div>
     <div v-else class="text-center">
       <img class="mt40 w250" src="@/assets/images/pic_page-non.png" />
-      <div class="fs15 c-gray-dark mt40">暂无数据</div>
+      <div class="fs15 c-gray-dark mt40">暂无收入数据</div>
     </div>
 
+    <!-- <van-divider v-if="list.length === 0" class="data-divider" /> -->
+
+    <!-- 收入曲线图 -->
+    <!-- <div class="incomeChart" ref="incomeChart"></div> -->
+
     <!-- 日期选择 -->
     <van-popup v-model="showDatePicker" position="bottom" :style="{ height: '40%' }">
       <van-datetime-picker v-model="selectedDate" type="year-month" @confirm="onDateConfirm" @cancel="onDateCancel" :max-date="currentDate" />
@@ -51,9 +56,10 @@
 </template>
 
 <script>
-import { Sticky, List, Button, Collapse, CollapseItem, Cell, CellGroup, DatetimePicker, Popup, Row, Col, Tab, Tabs } from 'vant'
+import { Sticky, List, Button, Collapse, CollapseItem, Cell, CellGroup, DatetimePicker, Popup, Row, Col, Tab, Tabs, Divider } from 'vant'
 import { getAgentIncome } from '@/api/ebiz/my/my.js'
 import Formatter from '@/assets/js/utils/date-utils.js'
+import echarts from 'echarts'
 export default {
   data() {
     return {
@@ -133,7 +139,91 @@ export default {
       monthActualPay: 0, // 当月实付
       monthShouldPay: 0, // 当月应付
       rewardInfoList: [], // 收益明细
-      paymentInfo: {} // 加扣款明细
+      paymentInfo: {}, // 加扣款明细
+      incomeChart: null,
+      incomeOption: {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          },
+          formatter: function(params) {
+            return `${params[0].axisValue}月<br/>${params[0].value}元`
+          }
+        },
+        title: {
+          text: '收入曲线图'
+        },
+        xAxis: {
+          type: 'category',
+          name: '月份',
+          nameTextStyle: {
+            fontSize: 10
+          },
+          axisLine: {
+            lineStyle: {
+              color: '#888'
+            }
+          },
+          axisLabel: {
+            color: '#888',
+            fontSize: 10
+          },
+          axisTick: {
+            show: false
+          },
+          data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+          boundaryGap: false
+        },
+        yAxis: {
+          type: 'value',
+          name: '收入(元)',
+          nameTextStyle: {
+            fontSize: 10
+          },
+          axisLabel: {
+            color: '#888',
+            fontSize: 10
+          },
+          axisLine: {
+            lineStyle: {
+              color: '#888'
+            }
+          },
+          axisTick: {
+            show: false
+          },
+          splitLine: false
+        },
+        series: [
+          {
+            data: [820, 932, 901, 634, 1290, 1330, 820, 322, 843, 1209, 432, 812],
+            type: 'line',
+            smooth: true,
+            areaStyle: {
+              color: {
+                type: 'linear',
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: 'rgba(255,0,0,0.9)'
+                  },
+                  {
+                    offset: 1,
+                    color: 'rgba(255,0,0,0.3)'
+                  }
+                ],
+                global: false
+              }
+            }
+          }
+        ],
+        color: ['#ff0000']
+      }
     }
   },
   created() {
@@ -141,12 +231,8 @@ export default {
     this.getIncomeInfo(currentMonth)
   },
   mounted() {
-    // 基于准备好的dom，初始化echarts实例
-    // this.myChart = echarts.init(this.$refs.echarts)
-    // 绘制图表
-    // this.myChart.setOption(this.option)
-    // 设置背景颜色
-    // document.body.style.backgroundColor = '#fff'
+    // this.incomeChart = echarts.init(this.$refs.incomeChart)
+    // this.incomeChart.setOption(this.incomeOption)
   },
   components: {
     [Collapse.name]: Collapse,
@@ -161,27 +247,13 @@ export default {
     [Tabs.name]: Tabs,
     [Button.name]: Button,
     [List.name]: List,
-    [Sticky.name]: Sticky
+    [Sticky.name]: Sticky,
+    [Divider.name]: Divider
   },
   methods: {
     searchCurrentMonth() {
       this.onDateConfirm(new Date())
     },
-    onLoad() {
-      setTimeout(() => {
-        for (let i = 0; i < 10; i++) {
-          this.list.push(this.list.length + 1)
-        }
-
-        // 加载状态结束
-        this.loading = false
-
-        // 数据全部加载完成
-        if (this.list.length >= 40) {
-          this.finished = true
-        }
-      }, 1000)
-    },
     onDateConfirm(val) {
       this.selectedDate = val
       // 确认选中的时间
@@ -251,6 +323,14 @@ export default {
 </script>
 
 <style lang="scss">
+.incomeChart {
+  height: 40vh;
+}
+
+.data-divider {
+  margin: 2em;
+}
+
 .payRoll {
   padding: 0 0.25em;
   display: flex;
@@ -313,7 +393,8 @@ export default {
 }
 
 .moneyContent {
-  padding-bottom: 70px;
+  padding-bottom: 2em;
+  border-bottom: none;
 }
 
 .user-income-container {

src/views/ebiz/questions/QuestionsDetail.vue

@@ -651,6 +651,13 @@ export default {
   async created() {
     // 问题件类型
     this.issueType = this.$route.params.type
+    if (this.issueType === 'TB89') {
+      document.title = '新契约基本问题件通知书'
+    } else if (this.issueType === '818901') {
+      document.title = '转账不成功问题件'
+    } else if (this.issueType === '828601') {
+      document.title = '补充资料通知书'
+    }
     if (this.isWeixin) {
       localStorage.setItem('token', this.$route.query.token)
       let imgBase64Data = sessionStorage.getItem('twoimgBase64Data')

src/views/ebiz/questions/QuestionsList.vue

@@ -248,13 +248,16 @@ export default {
     stateFilter(val) {
       switch (val) {
         case '0':
-          return '已下发'
+          return '待客户处理处理问题件'
         case '1':
-          return '已打印'
         case '2':
-          return '已回扫'
+          return '待核心处理问题件'
         case '3':
-          return '已回销'
+          return '已线下打印通知书,待客户处理'
+        case '4':
+          return '问题件逾期未处理,已撤单'
+        default:
+          return ''
       }
     }
   }

src/views/ebiz/sale/Detail.vue

@@ -6,6 +6,7 @@
         <van-cell-group>
           <van-cell title="投保单号" :value="OrderInfoDTO.orderNo" />
           <van-cell title="投保日期" :value="OrderInfoDTO.appntDateLabel" />
+          <van-cell title="订单状态" :value="OrderInfoDTO.orderStatus | orderStatusFilter" />
         </van-cell-group>
       </van-collapse-item>
 
@@ -34,7 +35,7 @@
         </van-collapse-item>
         <div v-if="OrderInfoDTO.bnfFlag == '法定受益人'">
           <van-cell-group>
-            <van-cell title="受益人" value="法定受益人" class="ml15"></van-cell>
+            <van-cell title="受益人" value="法定受益人" style="padding: .5em 1.5em;"></van-cell>
           </van-cell-group>
         </div>
         <div v-for="(itm, i) in item.bnfDTOs" :key="itm.name" class="pb10" v-else>
@@ -94,6 +95,7 @@
 import { Collapse, CollapseItem, Cell, CellGroup, Button } from 'vant'
 import { getDetail } from '@/api/ebiz/sale/sale'
 import { formatAllRisk } from '@/assets/js/utils/formatRiskList'
+import orderStatusMap from './js/orderStatus'
 export default {
   data() {
     return {
@@ -331,6 +333,12 @@ export default {
         }
       })
     }
+  },
+  filters: {
+    orderStatusFilter(val) {
+      let text = orderStatusMap.get(val)
+      return text ? text : ''
+    }
   }
 }
 </script>
@@ -342,10 +350,10 @@ export default {
   }
   /deep/ .van-collapse-item__content {
     padding-top: 0;
+    padding-bottom: 0;
   }
   /deep/.van-collapse-item__title {
-    // background: rgb(241, 241, 241);
-    padding-left: 30px;
+    padding: 0.5em 1.5em;
   }
   /deep/ .van-cell__value {
     text-align: left !important;

src/views/ebiz/sale/js/orderStatus.js

@@ -0,0 +1,62 @@
+const orderStatusMap = new Map()
+
+orderStatusMap
+  .set('01', '待客户确认')
+  .set('02', '待客户付款')
+  .set('03', '待公司确认')
+  .set('04', '待客户上载影像')
+  .set('05', '逾期关闭')
+  .set('06', '客户撤销')
+  .set('07', '公司谢绝')
+  .set('08', '订单成交')
+  .set('09', '订单退保')
+  .set('10', '订单待签单')
+  .set('11', '待生成电子保单')
+  .set('12', '退保/领取审核中')
+  .set('13', '等待出单')
+  .set('14', '支付中')
+  .set('15', '支付受理中')
+  .set('16', '承保中')
+  .set('17', '手动承保完成')
+  .set('18', '阿里云端数据同步中间状态')
+  .set('19', '支付失败')
+  .set('20', '待答问卷')
+  .set('21', 'ABS保单预约挂起中')
+  .set('22', 'ABS保单取消预约挂起中')
+  .set('23', '理赔挂起中')
+  .set('24', '保单终止')
+  .set('25', 'ABS保单受益权转让挂起中')
+  .set('26', '保单冻结挂起中')
+  .set('27', '冻结受益权转让挂起中')
+  .set('28', '受益权还原挂起中')
+  .set('29', '受益权转让挂起中')
+  .set('30', '受益权还原挂起中')
+  .set('31', '续保等待人核')
+  .set('32', '续保第一次健康告知异常')
+  .set('33', '待人核导核心')
+  .set('34', '人核导核心成功')
+  .set('35', '投保人保存成功')
+  .set('36', '被保人保存成功')
+  .set('37', '受益人人保存成功')
+  .set('38', '账户信息保存成功')
+  .set('39', '险种信息保存成功')
+  .set('40', '告知信息保存成功')
+  .set('41', '待转批扣')
+  .set('42', '转批扣成功')
+  .set('43', '待签名')
+  .set('44', '计划书转投保')
+  .set('45', '核心扣费失败')
+  .set('46', '自核不通过待转人核')
+  .set('47', '核心系统繁忙，请稍后重试 ')
+  .set('48', '修改账户信息 ')
+  .set('49', '修改银行影像信息')
+  .set('50', '待人核')
+  .set('51', '人工核保中')
+  .set('52', '问题件处理中')
+  .set('53', '核心待收费')
+  .set('54', '延期')
+  .set('55', '换卡支付')
+  .set('56', '卡单投被保人信息保存成功')
+  .set('57', '卡单保存账户信息成功')
+
+export default orderStatusMap