Merge branch 'ren' into develop

12-7.md

+### dom操作，一次性插入100个节点，和我分100次插入1个节点，哪个性能更高？
+
+**答案**： 一次性插入100个节点性能更好。
+
+**理解**：一次性插入100个，只对dom节点进行了一次操作，而分100次插入则操作了100次dom节点。插入节点时dom树每次会重新计算，生成新的dom树,渲染树也会跟着改变。浏览器会使渲染树中受影响的部分失效，重新绘制，因此也会进行100次重绘。影响性能。（也不知是影响cpu? Gpu? 还是浏览器--）。
+
+
+### 问题
+
+- ssr从服务器返回字符串，进行HTML渲染，是怎么返回的？以何种方式返回的？
+- js解析主线程跟GUI渲染线程存在优先级吗？

src/pages/financingTrial/financing-trial.vue

@@ -2,7 +2,7 @@
  * @Descrip 融资试算
  * @Author: your name
  * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-12-06 11:33:14
+ * @LastEditTime: 2019-12-06 15:14:53
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -95,6 +95,7 @@ export default {
       vm.$refs.scroll.scrollToTop()
       vm.$refs.scroll.update(false)
       if (from.name === 'ProDetailed') {
+        vm.lists = []
         vm.price_date_to = vm.$route.params.price_date_to // 有效日期
         vm.plan_price = vm.$route.params.plan_price // 参考价
         vm.division = vm.$route.params.division
@@ -137,6 +138,7 @@ export default {
               searchInput: vm.searchInput,
               pagenum: vm.pagenum,
               division: vm.division, // 收藏到试算通过产品线查询
+              bp_id: vm.$route.params.bp_id,
             }
             vm.hlsPopup.showLoading('数据加载中')
             vm.hlsHttp.post(url, param).then(function (res) {

src/pages/messageCenter/message-list.vue

@@ -4,6 +4,13 @@
       <div slot="center" class="top-word">消息通知</div>
     </h-header>
     <!-- <h-content class="content"> -->
+    <div v-if="list.length===0" class="null">
+      <div class="display">
+        <img src="@/assets/contractRepayment/null.png" alt="">
+        <p>暂时没有还款记录</p>
+        <div @click="$routeGo()">返回</div>
+      </div>
+    </div>
     <scroll
       ref="scroll" :updateData="[list]" :pullUp="true" class="has-header"
       @pullingUp="getInfo">
@@ -52,7 +59,8 @@
         </item-option>
       </section>
       <!-- </h-content> -->
-  </scroll></h-view>
+    </scroll>
+  </h-view>
 </template>
 <script>
 export default {

src/pages/myInfo/my-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-11-07 17:48:53
- * @LastEditTime: 2019-11-28 15:32:52
+ * @LastEditTime: 2019-12-07 18:21:48
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -94,7 +94,7 @@
             <img slot="left-icon" src="@/assets/myInfo/myRefund.png" class="left-icon" >
             <div slot="name">我的还款</div>
           </item>
-        <!--  <item @click.native="changeDrawbackList">
+          <!--  <item @click.native="changeDrawbackList">
             <img slot="left-icon" src="@/assets/myInfo/repay.png" class="left-icon" >
             <div slot="name">业务退款</div>
           </item>-->
@@ -252,8 +252,8 @@ export default {
   },
   activated () {},
   methods: {
-    openTest(){
-      cordova.InAppBrowser.open('http://www.baidu.com', '_blank', 'location=yes');
+    openTest () {
+      cordova.InAppBrowser.open('http://www.baidu.com', '_blank', 'location=yes')
     },
     // 查询头像
     getHead () {

src/pages/videoSign/video-list.vue

@@ -42,6 +42,9 @@
                 <p v-if="item.interview_status ==='待面签'" class="to-unSign" @click="toSign">
                   <img src="@/assets/videoSign/unSign.png" >&nbsp;视频面签
                 </p>
+                <p v-if="item.interview_status ==='RESERVED'" class="to-unSign" @click="toSign">
+                  <img src="@/assets/videoSign/unSign.png" >&nbsp;视频回放
+                </p>
               </li>
             </ul>
           </div>
@@ -150,7 +153,7 @@ export default {
         },
       })
     },
-    /*toSign2 () {
+    /* toSign2 () {
       let vm = this
       var sendStr = 'xcmg'
       hls.cordova.cloudroom.CloudRoomService.loginCloudRoom(sendStr, function (data) {
@@ -159,7 +162,7 @@ export default {
       function (fail) {
         hlsPopup.showLongCenter('登录失败')
       })
-    },*/
+    }, */
     entrySign () {
       var sendStr = 'xcmg'
       hlsPopup.showConfirm({
@@ -179,7 +182,7 @@ export default {
         },
       })
     },
-   /* entrySign2 () {
+    /* entrySign2 () {
       var sendStr = 'xcmg'
       hls.cordova.cloudroom.CloudRoomService.helpYourSelf(sendStr, function (data) {
 
@@ -187,7 +190,7 @@ export default {
       function (fail) {
         hlsPopup.showLongCenter('进入会话失败')
       })
-    },*/
+    }, */
     toWatch () {
       hlsPopup.showLongCenter('敬请期待')
     },