Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/contractCreate/create-base-info.vue

@@ -335,7 +335,7 @@
         </div>
       </div>
       <div v-if="!fromPutted">
-        <item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider">
+        <item-option v-for="(item,index) in selectUdertake" ref="underTake" :key="index" class="mySlider">
           <list-item :item-height="68">
             <item>
               <span slot="left-icon" class="left-icon">{{ index+1 }}</span>
@@ -570,8 +570,6 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          Object.assign(vm.saveInfo, res.info)
-          vm.selectUdertake = res.lists
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -978,6 +976,7 @@ export default {
         }
       })
       this.selectUdertake.splice(deleteIndex, 1)
+      this.$refs.underTake[0].reset()
       this.deleteGuta(e)
     },
   },

src/pages/contractCreate/sales-info.vue

@@ -17,7 +17,7 @@
       <list-item :item-height="44" class="second-part">
         <item :showArrow="true" @click.native="picker">
           <div slot="name" class="font-color required">承租人</div>
-          <input slot="content" v-model="lessee" placeholder="请选择">
+          <input slot="content" v-model="lessee" readonly placeholder="请选择">
         </item>
         <item :showArrow="true">
           <div slot="name" class="font-color required">业务类型</div>

src/pages/messageCenter/message-list.vue

@@ -49,7 +49,7 @@
             </div>
           </list-item>
           <div slot="buttons">
-            <option-button type="warn" text="删除" @click.native="deleteFun(parentIndex)" />
+            <option-button type="warn" text="删除" @click.native="deleteFun(parentIndex,item)" />
           </div>
         </item-option>
       </section>
@@ -161,7 +161,23 @@ export default {
         }
       })
     },
-    deleteFun (Index) {
+    deleteData (item) {
+      let vm = this
+      let url = process.env.basePath + 'app_notice_delete'
+      let param = {
+        notice_id: item.notice_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          hlsPopup.showSuccess('删除成功')
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    deleteFun (Index, item) {
       let vm = this
       hlsPopup.showConfirm({
         title: '提示',
@@ -171,6 +187,7 @@ export default {
             vm.list.remove(Index)
             vm.list.sort()
             vm.$refs.itemOption[0].reset()
+            vm.deleteData(item)
           }
         },
       })

src/pages/pay/payment/new-list.vue

@@ -40,9 +40,7 @@
             </div>
             <div class="pay-input">
               <span>逾期利息</span>
-              <CurrencyInput
-                v-model="liquidated_damages" class="currencyInput" readonly type="text"
-                placeholder="请输入支付金额" />
+              <span class="currencySpan">￥{{ liquidated_damages|currency }}</span>
             </div>
           </div>
         </div>
@@ -202,6 +200,7 @@ export default {
 </script>
 <style lang='less' >
 #first-pay {
+
   .currencyInput{
     height:37px;
     line-height: 37px;
@@ -300,7 +299,11 @@ export default {
           display: flex;
           align-items: center;
         }
-
+  .currencySpan{
+    display: inline-block;
+    text-align: right;
+    padding-right:10px;
+  }
         input {
           flex: 3;
           text-align: right;