Merge branch 'dev3.6' of http://192.168.3.207:10080/qmx/jy into dev3.6

src/jfw/modules/app/src/web/staticres/jyapp/me/css/mine.css

@@ -285,8 +285,8 @@
 /* 签到 */
 .sign {
   position: relative;
-  margin: -68px 16px 0;
-  padding: 16px 16px 6px 16px;
+  margin: 0.24rem .32rem 0;
+  padding: 0.32rem;
   border-radius: 8px;
   background: url(../images/dateGetBg@2x.png) no-repeat center center;
   background-size: cover;
@@ -376,6 +376,13 @@
   background-size: contain;
   color: #fff;
 }
+.sign .points-record{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: .24rem;
+  color: #5F5E64;
+}
 @keyframes turn{
   0%{-webkit-transform:rotate(0deg);}
   25%{-webkit-transform:rotate(90deg);}

src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -493,8 +493,10 @@ var vNode = {
         points = 15
       }
       return points
+    },
+    recordFn: function() {
+      window.location.href = '/page_points/list'
     }
-
   }
 }
 var signFn = new Vue(vNode)

src/jfw/modules/app/src/web/templates/me/mine.html

@@ -98,6 +98,10 @@
                   <div :class="['sun', index == getToday - 1 && showAnimate ? 'animate' : '']"></div>
                 </div>
               </div>
+              <div class="points-record" @click="recordFn">
+                查看记录
+                <span class="j-icon base-icon icon-arrow-right" style="width: 0.32rem;height: 0.32rem;"></span>
+              </div>
             </div>
             <div class="list">
                 <!--账号合并-->

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -79,7 +79,7 @@
         <div class="description">
           <img src="/jyapp/images/jianyubi.png" alt="">
           <p>分享招标信息及文档，好友访问立得剑鱼币</p>
-          <a href="/jyapp/integral/page/share">了解详情</a>
+          <a href="/page_points_app/share">了解详情</a>
         </div>
         <div class="sheet-option">
           <ul class="shareType">

src/web/staticres/me/css/mine.css

@@ -187,7 +187,7 @@
 .sign {
   position: relative;
   margin: 0.32rem .32rem 0;
-  padding: .32rem .32rem .12rem .32rem;
+  padding: .32rem;
   border-radius: 8px;
   background: url(../images/dateGetBg@2x.png) no-repeat center center;
   background-size: cover;
@@ -278,6 +278,13 @@
   background-size: contain;
   color: #fff;
 }
+.sign .points-record{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: .24rem;
+  color: #5F5E64;
+}
 @keyframes turn{
   0%{-webkit-transform:rotate(0deg);}
   25%{-webkit-transform:rotate(90deg);}

src/web/staticres/me/js/mine.js

@@ -345,8 +345,10 @@ var vNode = {
         points = 15
       }
       return points
+    },
+    recordFn: function() {
+      window.location.href = '/page_points/list'
     }
-
   }
 }
 var signFn = new Vue(vNode)

src/web/templates/weixin/my.html

@@ -79,6 +79,7 @@
                     <div :class="['sun', index == getToday - 1 && showAnimate ? 'animate' : '']"></div>
                   </div>
                 </div>
+                <div class="points-record" @click="recordFn">查看记录<span class="j-icon base-icon icon-arrow-right"></span></div>
               </div>
             </div>
             <div class="main-list">