uat 1.1.0

config/prod.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app"',
-  currentVersion: '"1.0.9"'
+  currentVersion: '"1.1.0"'
 }

config/uat.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"1.3.7"'
+  currentVersion: '"1.3.8"'
 }

src/pages/contractCreate/creat-rent-info.vue

@@ -397,6 +397,7 @@ export default {
         if (vm.fromPage === 'sale') {
           vm.fromList = false
           vm.isReadOnly = false
+          vm.rentInfoQuery()
         } else if (vm.fromPage === 'list') {
           if (window.localStorage.contractReadonly === 'true') {
             vm.isReadOnly = true

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>
@@ -429,6 +429,11 @@ export default {
     }
   },
   watch: {
+    $route (to, from) {
+      if(to.name === 'SalesInfo'){
+        this.routeGoCustom()
+      }
+    },
     checked: {
       handler (newVal, oldVal) {
         if (newVal === false) {
@@ -529,7 +534,9 @@ export default {
       }
     })
   },
-  mounted () {},
+  mounted () {
+
+  },
   methods: {
     // 自定义返回逻辑：第一次新建时返回判断是否保存数据，未保存提示保存
     routeGoCustom () {
@@ -563,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)
         }
@@ -971,6 +976,7 @@ export default {
         }
       })
       this.selectUdertake.splice(deleteIndex, 1)
+      this.$refs.underTake[0].reset()
       this.deleteGuta(e)
     },
   },

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

@@ -154,6 +154,7 @@ export default {
         vm.cddItemList = []
         vm.bpClass = window.localStorage.bp_class
         vm.status = window.localStorage.user_bp_status
+        vm.fromPage = window.localStorage.fromPage
         vm.loadItemList()
         vm.queryCheckId()
         if (vm.fromPage === 'sale') {

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>
@@ -87,7 +87,7 @@
         <item @click.native="showTime('YYYY-MM-DD')">
           <div slot="name" class="font-color required">签约日期</div>
           <input
-            slot="content" v-model="salesInfo.sale_date"
+            slot="content" v-model="salesInfo.sale_date" placeholder="请选择签约日期"
             readonly>
           <img src="@/assets/contractCreate/date.png" alt="" class="date-pic">
         </item>
@@ -168,7 +168,7 @@ export default {
         office_id: '', // 办事处id
         factory: '', // 主机厂id
         manu_manager: '', // 办事处业务员
-        sale_date: '请选择签约日期',
+        sale_date: '',
         project_id: '',
       },
     }
@@ -216,7 +216,7 @@ export default {
           office_id: '', // 办事处id
           factory: '', // 主机厂id
           manu_manager: '', // 办事处业务员
-          sale_date: '请选择',
+          sale_date: '',
           bp_type: window.localStorage.bp_type,
           project_id: '',
         }

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;

src/pages/productQuery/product-detailed.vue

@@ -420,7 +420,7 @@ export default {
         color: #232323;
         letter-spacing: 0;
         font-weight: 600;
-        margin-top: 8px;
+        margin-top: 25px;
       }
       .pro-price {
         width: 100%;

www/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.cde4bbe6ac973f69bb5ea25c8e369aa4.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.9f360068f2fcc38c500b.js></script></body></html>
\ No newline at end of file