peko1.1.0：暂存账单以及常驻活动

view/peko/vue-project/myincome/build/webpack.base.conf.js

@@ -81,6 +81,14 @@ module.exports = {
         options: {
           symbolId: 'icon-[name]'
         }
+      },
+    //   {
+    //     test: /\.(js|vue)$/,
+    //     loader: 'language-tw-loader',
+    //   },
+      {
+        test:/\.(js|vue)$/,
+        loader:'language-hk-loader'
       }
     ]
   },

view/peko/vue-project/myincome/config/index.js

@@ -22,7 +22,8 @@ module.exports = {
     }},
 
     // Various Dev Server settings
-    host: '127.0.0.1', // can be overwritten by process.env.HOST
+    // host: '127.0.0.1', // can be overwritten by process.env.HOST
+    host: '192.168.9.200', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

view/peko/vue-project/myincome/package-lock.json

@@ -5946,6 +5946,16 @@
         "is-buffer": "^1.1.5"
       }
     },
+    "language-hk-loader": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/language-hk-loader/-/language-hk-loader-1.0.1.tgz",
+      "integrity": "sha512-OmOLx119bkmabkQYn4GvxzMrnp2PAxX6lhHkMwqyaHA6Casi6SyO5uhst1+svPJcR+kA7r8d7H3ri97N1JKXng=="
+    },
+    "language-tw-loader": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/language-tw-loader/-/language-tw-loader-1.0.3.tgz",
+      "integrity": "sha512-fA+6+Dn2IQUBN8QAfVO6ek+flzqdUmPvbKYDNXE/64invrDWIzJiXjv2PB2++F06lKxSso/B9clHUHN9jhx0gg=="
+    },
     "last-call-webpack-plugin": {
       "version": "2.1.2",
       "resolved": "https://registry.npm.taobao.org/last-call-webpack-plugin/download/last-call-webpack-plugin-2.1.2.tgz",

view/peko/vue-project/myincome/package.json

@@ -14,6 +14,8 @@
     "crypto-js": "^4.0.0",
     "fastclick": "^1.0.6",
     "jsencrypt": "^3.0.0-rc.1",
+    "language-hk-loader": "^1.0.1",
+    "language-tw-loader": "^1.0.3",
     "lib-flexible": "^0.3.2",
     "node-sass": "^4.13.0",
     "postcss-pxtorem": "^5.1.1",

view/peko/vue-project/myincome/src/main.js

@@ -10,27 +10,30 @@ Vue.config.productionTip = false;
 import 'vant/lib/index.css';
 import vant from 'vant';
 import 'lib-flexible/flexible'
-// import Vconsole from 'vconsole'
-// new Vconsole()
+import Vconsole from 'vconsole'
+import { EnvCheck, checkVersion } from '@/utils/browser.js'
+if (EnvCheck() === 'test') {
+    new Vconsole();
+}
 //300毫秒
 import fastClick from 'fastClick'
 fastClick.attach(document.body)
 //ios中input标签点击无效（或者需要点击多次）
 fastClick.prototype.focus = function (targetElement) {
-  var length;
-  if (targetElement.setSelectionRange && targetElement.type.indexOf('date') !== 0 && targetElement.type !== 'time' && targetElement.type !== 'month') {
-    length = targetElement.value.length;
-    targetElement.focus();
-    targetElement.setSelectionRange(length, length);
-  } else {
-    targetElement.focus();
-  }
+    var length;
+    if (targetElement.setSelectionRange && targetElement.type.indexOf('date') !== 0 && targetElement.type !== 'time' && targetElement.type !== 'month') {
+        length = targetElement.value.length;
+        targetElement.focus();
+        targetElement.setSelectionRange(length, length);
+    } else {
+        targetElement.focus();
+    }
 };
 Vue.use(vant);
 new Vue({
-  el: '#app',
-  router,
-  store,
-  components: { App },
-  template: '<App/>'
+    el: '#app',
+    router,
+    store,
+    components: { App },
+    template: '<App/>'
 });

view/peko/vue-project/myincome/src/utils/getUid.js

@@ -28,8 +28,8 @@ export default function getId() {
     }
   } else {
     window.sessionStorage.clear();
-    info.uid = 936365;
-    info.ticket = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0aWNrZXRfdHlwZSI6bnVsbCwidWlkIjo5MzYzNjUsInRpY2tldF9pZCI6IjFkMWU2NjRlLTllYTctNGE2Yy05NzhiLTI3Nzc2ZTI2MTk4ZCIsImV4cCI6MzYwMCwiY2xpZW50X2lkIjoiZXJiYW4tY2xpZW50In0.Ynu92NqCtV1tDCihkA_CWYjhfqcILBLCL1RQ_yU3C1M"
+    info.uid = 1016;
+    info.ticket = "test"
   }
 }
 // export default function getJurisdiction() {

view/peko/vue-project/myincome/src/utils/request.js

@@ -24,7 +24,7 @@ const service = axios.create({
 service.interceptors.request.use(config => {
   if (router.apps[0]._route.name === 'Login') {
     config.headers = {}
-  } else if (!checkVersion().app){
+  } else if (!checkVersion().app){//false
     if (router.apps[0]._route.name === 'WithDrawInfoBind' && config.url ==`/sms/verify` || config.url==`/sms/getCode`) {
         config.headers = {
           'h5_token': window.sessionStorage.getItem('ticket'),
@@ -50,7 +50,7 @@ service.interceptors.request.use(config => {
         config.headers = {
             'pub_ticket': window.sessionStorage.getItem('ticket'),
             'pub_uid': window.sessionStorage.getItem('uid'),
-            'client': 'h5'
+            'client': 'h5',
           }
     }
   }

view/peko/vue-project/myincome/src/view/myincome/DiamondLog.vue

@@ -10,6 +10,10 @@
         <span>支出记录</span>
         <span :class="tab === 12 ?'active' :''"></span>
       </div>
+      <div :class="tab === 1 ?'active' :''" @click="cutTab(1)">
+        <span>获得奖励</span>
+        <span :class="tab === 1 ?'active' :''"></span>
+      </div>
     </div>
     <van-index-bar
       :index-list="indexList"
@@ -31,7 +35,7 @@
             v-if="thinkTime(index, item)"
           >
             <span class="time">{{ relDate(item.date) }}</span>
-            <span>{{tab === 11 ? "共收入" : '共支出'}}</span>
+            <span>{{tab === 11 ? "共收入" : tab == 1 ? '共获得' : '共支出'}}</span>
             <span class="total">{{item.total}}</span>
             <span>钻石</span>
           </van-index-anchor>
@@ -71,6 +75,9 @@
               <p
                 v-else-if="tab === 12 && item1.targetNick"
               >{{ item1.srcNick }} 赠送 {{item1.targetNick}}</p>
+              <!-- <p>1</p> -->
+              <p v-if="tab === 1">{{item1.targetNick}}赠送{{item1.giftName}}</p>
+              <!-- <p v-else-if="tab === 1 && item1.objType === 39">房间红包-发生在{{ item1.roomTitle }}</p> -->
               <div class="diamond">
                 <img src="@/assets/img/diamond.png" alt />
                 <span>{{ item1.amount }}</span>
@@ -219,18 +226,19 @@ export default {
     align-items: center;
     justify-content: center;
     &.active {
-      color: #FFA936;
+      color: #1F1A4E;
     }
     span {
       font-weight: bold;
       &:last-child {
-        width: 9px;
-        height: 5px;
+        width: 16px;
+        height: 3px;
         background: #fff;
         margin-top: 5px;
         border-radius: 3px;
         &.active {
-          background: #FFA936;
+        //   background: #FFA936;
+        background: linear-gradient(255deg, #CC66FF 1%, #9CB3FF 52%, #13E2F5 100%);
         }
       }
     }