xgwangman 4 лет назад
Родитель
Сommit
2c47c26856

+ 2 - 1
src/jfw/modules/app/src/web/templates/frontRouter/portraitRecord/sess/index.html

@@ -30,7 +30,7 @@
           <div class="p-date">
             <div class="d-box flex">
               使用记录
-              <van-field v-model="dValue" @click="usedHised" placeholder="显示图标" right-icon="play" readonly/>
+              <van-field v-model="dValue" @click="usedHised" placeholder="选择年月" right-icon="play" readonly/>
             </div>
             <div class="word-tips">
               当前已使用:<span>{points.usage}个</span>
@@ -39,6 +39,7 @@
           <!-- 日期弹出框 -->
           <van-popup v-model:show="pShow" round position="bottom">
             <van-datetime-picker
+              class="record-time-d"
               v-model="curDate"
               type="year-month"
               title="选择日期"

+ 3 - 0
src/web/staticres/common-module/portraitRecord/css/index.css

@@ -362,4 +362,7 @@
     text-align: CENTER;
     color: #5f5e64;
     line-height: .4rem;
+}
+.record-time-d .van-picker__confirm {
+    color: #2ABED1;
 }

+ 2 - 2
src/web/staticres/common-module/portraitRecord/js/index-wx.js

@@ -66,10 +66,10 @@ var vm = new Vue({
     }
   },
   created: function () {
-      var _this = this
       this.years = new Date().getFullYear()
       this.months = parseInt(new Date().getMonth() + 1)
       this.dValue = this.years + '年' + this.months + '月'
+      this.curDate = new Date()
       this.subPoint()
       this.onLoad()
   },
@@ -125,7 +125,7 @@ var vm = new Vue({
               abbr: getShortName(v.company_name),
               color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
               legal: v.legal_person,
-              money: parseInt(v.capital),
+              money: v.capital,
               address: v.company_address,
               _id: v.id,
               status: _this.statusEnum.indexOf(v.company_status) || 0,

+ 2 - 2
src/web/staticres/common-module/portraitRecord/js/index.js

@@ -66,10 +66,10 @@ var vm = new Vue({
     }
   },
   created: function () {
-      var _this = this
       this.years = new Date().getFullYear()
       this.months = parseInt(new Date().getMonth() + 1)
       this.dValue = this.years + '年' + this.months + '月'
+      this.curDate = new Date()
       this.subPoint()
       this.onLoad()
   },
@@ -125,7 +125,7 @@ var vm = new Vue({
               abbr: getShortName(v.company_name),
               color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
               legal: v.legal_person,
-              money: parseInt(v.capital),
+              money: v.capital,
               address: v.company_address,
               _id: v.id,
               status: _this.statusEnum.indexOf(v.company_status) || 0,

+ 9 - 0
src/web/staticres/frontRouter/pc/seeHistory/css/index-pc.css

@@ -32,6 +32,9 @@
 .l-tabs .tips span {
     color: #2CB7CA;
 }
+.r-tabs {
+    position: relative;
+}
 .r-tabs .r-word {
     color: #686868;
     line-height: 22px;
@@ -50,6 +53,12 @@
 .r-tabs .date-class .el-input__suffix {
     top: -5px;
 }
+.r-tabs .r-icons {
+    position: absolute;
+    top: 6px;
+    right: 8px;
+    color: #aaa;
+}
 .see-content .lists {
     flex-direction: initial;
     align-items: flex-start;

+ 3 - 2
src/web/staticres/frontRouter/pc/seeHistory/js/index-pc.js

@@ -54,7 +54,8 @@ var vm = new Vue({
     created() {
         this.years = new Date().getFullYear()
         this.months = parseInt(new Date().getMonth() + 1)
-        this.dateVal = this.years + '年' + this.months + '月'
+        // this.dateVal = this.years + '年' + this.months + '月'
+        this.dateVal = new Date()
         this.subPoint()
         this.subRecord()
     },
@@ -96,7 +97,7 @@ var vm = new Vue({
                             abbr: getShortName(v.company_name),
                             color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
                             legal: v.legal_person,
-                            money: parseInt(v.capital),
+                            money: v.capital,
                             phone: v.company_phone,
                             time: v.establishStamp,
                             address: v.company_address,

+ 1 - 0
src/web/templates/frontRouter/pc/seeHistory/sess/index.html

@@ -43,6 +43,7 @@
                     :clearable="false"
                     :editable="false">
                 </el-date-picker>
+                <i class="el-icon-arrow-down r-icons"></i>
             </div>
         </div>
         <div class="see-content w" v-show="seeList.length !== 0">