Merge remote-tracking branch 'origin/dev4.5.8' into dev4.5.8

src/jfw/modules/app/src/web/templates/dataPack/index.html

@@ -90,7 +90,7 @@
                             <div class="l-left r-right">
                                 <p>{item.resourceType}</p>
                                 <p>{changeNum(item.number)}条</p>
-                                <p>{item.validYear}年</p>
+                                <p>{item.validYear == -1 ? '-' : item.validYear + '年'}</p>
                                 <p>{changeDate(item.endTime)}</p>
                                 <p>{changeDate(item.createTime)}</p>
                             </div>

src/web/staticres/common-module/data-pack/js/index.js

@@ -88,7 +88,13 @@ var vm = new Vue({
       }
     },
     soonCharge() {// 立即充值
-      location.href = '/jyapp/dataPack/createOrder'
+      // 判断是否为微信浏览器
+      var ua = window.navigator.userAgent.toLowerCase()
+      if(ua.match(/MicroMessenger/i) == 'micromessenger'){
+          location.href = '/swordfish/dataPack/createOrder'
+      }else{
+          location.href = '/jyapp/dataPack/createOrder'
+      }
     },
     changeNum(data) {// 数字处理函数
       if (data) {

src/web/staticres/frontRouter/pc/my_data_packet/css/index-pc.css

@@ -131,7 +131,8 @@
     height: 122px;
     border-radius: 8px 8px 0 0;
     padding: 28px 32px;
-    background: linear-gradient(276deg,#14a7d6 100%, #1ec2db 100%);
+    /* background: linear-gradient(276deg,#14a7d6 100%, #1ec2db 100%); */
+    background: -webkit-linear-gradient(180deg,#14a7d6 0%, #1ec2db 100%);
 }
 
 .data-box .down-line .d-chong .d-head .s-zhu {

src/web/templates/pc/dataPack/index.html

@@ -102,7 +102,7 @@
                                     </el-table-column>
                                     <el-table-column label="使用有效期" align="center">
                                         <template slot-scope="scope">
-                                            <span>{scope.row.validYear}年</span>
+                                            <span>{scope.row.validYear == -1 ? '--' : scope.row.validYear + '年'}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column label="到期时间" align="center">
@@ -143,7 +143,7 @@
                                     </div>
                                     <el-table-column prop="personal_name" label="用户姓名" align="center">
                                         <template slot-scope="scope">
-                                            <span>{scope.row.personal_name?scope.row.personal_name:'-'}</span>
+                                            <span>{scope.row.personal_name?scope.row.personal_name:'--'}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column prop="export_timestamp" label="导出时间" align="center"></el-table-column>

src/web/templates/weixin/dataPack/index.html

@@ -101,7 +101,7 @@
                                 <div class="l-left r-right">
                                     <p>{item.resourceType}</p>
                                     <p>{changeNum(item.number)}条</p>
-                                    <p>{item.validYear}年</p>
+                                    <p>{item.validYear == -1 ? '-' : item.validYear + '年'}</p>
                                     <p>{changeDate(item.endTime)}</p>
                                     <p>{changeDate(item.createTime)}</p>
                                 </div>