提交福袋规则页面，暂存提现

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

@@ -1,6 +1,6 @@
 <template>
   <div class="box-all">
-    <navigation v-if="!this.$store.state.isApp" title="水晶记录" rightTitle="鉆石记录"></navigation>
+    <navigation v-if="!this.$store.state.isApp" title="金幣记录"></navigation>
     <div :class="!this.$store.state.isApp ? 'crystal-top' : 'crystal-top crystal-top-app'">
       <div class="box-top-title">
         <div
@@ -50,7 +50,7 @@
             <span v-if="item.associateName" style="color:black">{{item.associateName.length>8?item.associateName.slice(0,8):item.associateName}}</span>
             <span>共收入</span>
             <span class="total">{{item.total}}</span>
-            <span>水晶</span>
+            <span>金幣</span>
           </van-index-anchor>
 
           <div class="in-all-detail" v-for="(item1, index1) in item[item.date]" :key="index1">
@@ -70,15 +70,15 @@
                 <div v-if="tableType == 4 || tableType == 3" class="item-title">{{relDate(item1.recordTime,1)}}</div>
                 <div v-if="tableType == 13" class="item-title">{{item1.targetNick}}</div>
                 <div class="item-left-dsc" v-if="item1.objType === 72 || item1.objType === 73">
-                  接受CP邀请获得总价值 {{item1.amount | abs}} <span>水晶</span> 的收入
+                  接受CP邀请获得总价值 {{item1.amount | abs}} <span>金幣</span> 的收入
                 </div>
                 <div class="item-left-dsc" v-else>
                   收到总价值 {{item1.amount | abs}}
-                  <span>水晶</span> 的礼物
+                  <span>金幣</span> 的礼物
                 </div>
               </div>
               <div class="crystal">
-                <img src="@/assets/img/crystal.png" alt />
+                <img src="@/assets/img/gold.png" alt />
                 <span
                   :class="type == 0 ? 'item-right-text':'item-right-text-red'"
                 >{{type == 0 ? '+' : '-'}}{{ item1.amount }}</span>
@@ -393,7 +393,7 @@ export default {
   },
 
   created() {
-    document.title = "水晶记录";
+    document.title = "金幣记录";
     // this.getList(1);
     common.initNav({
       type: 1,

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

@@ -9,32 +9,33 @@
     </div>-->
     <navigation v-if="!this.$store.state.isApp" title="金币记录"></navigation>
     <div :class="!this.$store.state.isApp ? 'crystal-top' : 'crystal-top crystal-top-app'">
-      <!-- <div class="box-top-title">
+      <div class="box-top-title">
         <div
           v-for="(item,index) in typeList"
           :key="index"
           :class="type==index? 'title-left-select':'title-left-unselect'"
           @click="setType(index)"
         >{{item}}</div>
-      </div> -->
-      <!-- <div class="box-top-title-line">
+      </div>
+      <div class="box-top-title-line">
         <div v-if="type==0" class="title-left-line">
           <div class="title-left-line-white"></div>
         </div>
         <div v-if="type==1" class="title-right-line">
           <div class="title-right-line-white"></div>
         </div>
-      </div> -->
+      </div>
 
-      <!-- <div class="table-card" v-if="type==0">
+      <div class="table-card" v-if="type==0">
         <div :class="tableType==5? 'table-item':'table-item-unselect'" @click="getDate(5)">水晶结算收入</div>
         <div :class="tableType==6? 'table-item':'table-item-unselect'" @click="getDate(6)">活动发放收入</div>
+         <div :class="tableType==14? 'table-item':'table-item-unselect'" @click="getDate(14)">提现金币返还</div>
       </div>
 
       <div class="table-card" v-if="type==1">
         <div :class="tableType==9? 'table-item':'table-item-unselect'" @click="getDate(9)">提现支出</div>
         <div :class="tableType==10? 'table-item':'table-item-unselect'" @click="getDate(10)">兑换支出</div>
-      </div> -->
+      </div>
     </div>
 
     <!-- <div class="item-gray">
@@ -48,10 +49,9 @@
             <div class="item-left">
               <div v-if="tableType == 5" class="item-left-title">水晶 转换 金币收入</div>
               <div v-if="tableType == 6" class="item-left-title">活动发放 金币收入</div>
+               <div v-if="tableType == 14" class="item-left-title">提现 金币返还</div>
               <div v-if="tableType == 9" class="item-left-title">{{item1.amount | abs}}金币提现</div>
-              <div v-if="tableType == 10" class="item-left-title">{{item1.amount | abs}}金币兑换鉆石</div>
-              <div v-if="tableType == 14 && item1.objType == 2" class="item-left-title">提现</div>
-              <div v-if="tableType == 14 && item1.objType == 25" class="item-left-title">提现驳回</div>
+              <div v-if="tableType == 10" class="item-left-title">{{item1.amount | abs}}金币兑换钻石</div>
               <div class="item-left-dsc">{{dateFormat(item1.recordTime)}}</div>
             </div>
             <div class="item-right">
@@ -59,7 +59,7 @@
                 <img src="@/assets/img/gold.png" />
               </div>
               <div
-                :class="item1.objType == 2 ? 'reduceNum' : 'addNum'"
+                :class="tableType==5||tableType==6||tableType==14? 'item-right-text':'item-right-text-red'"
               >{{item1.amount}}</div>
             </div>
           </div>
@@ -67,7 +67,36 @@
       </div>
     </van-list>
 
+    <!-- <div style="margin-top:5px;" v-for="(item,index) in billList"
+                        :key="item.id">
+            <div style="margin-top:5px;" v-for="(item1,index1) in item[item.date]"
+                        :key="item1.id">
+                <div class="item">
+                    <div class="item-left">
+                        <div v-if="tableType == 5" class="item-left-title">水晶 转换 金币收入</div>
+                        <div v-if="tableType == 6" class="item-left-title">活动发放 金币收入</div>
+                        <div v-if="tableType == 9" class="item-left-title">{{item1.amount | abs}}金币提现</div>
+                        <div v-if="tableType == 10" class="item-left-title">{{item1.amount | abs}}金币兑换钻石</div>
+                        <div class="item-left-dsc">{{dateFormat(item1.date)}}</div>
+                    </div>
+                    <div class="item-right">
+                        <div :class="tableType==5||tableType==6? 'item-right-text':'item-right-text-red'">{{item1.amount}}</div>
+                        <div class="item-right-img"><img src="../../assets/img/gold.png" /></div>
+                    </div>
+                </div>
+            </div>
+    </div>-->
 
+    <!-- <div class="item">
+            <div class="item-left">
+                <div class="item-left-title">水晶 转换 金币收入</div>
+                <div class="item-left-dsc">2020-02-29</div>
+            </div>
+            <div class="item-right">
+                <div class="item-right-text">+5445.5</div>
+                <div class="item-right-img"><img src="../../assets/img/gold.png" /></div>
+            </div>
+    </div>-->
   </div>
 </template>
 <style lang="scss" type="text/css" scoped>
@@ -85,7 +114,7 @@
   }
 }
 .van-list {
-//   margin-top: 70px;
+  margin-top: 70px;
 }
 .van-cell {
   padding: 0;
@@ -295,13 +324,13 @@
 }
 
 .item-left-title {
-  color: #1F1A4E;
+  color: #333333;
   font-size: vw(15);
   line-height: 30px;
 }
 
 .item-left-dsc {
-  color: #B3B3C3;
+  color: #999999;
   font-size: vw(11);
 }
 
@@ -330,16 +359,6 @@
   font-size: 15px;
   font-weight: bold;
 }
-.reduceNum{
-    color: #B3B3C3;
-    font-size: vw(20);
-    // font-weight: bold;
-}
-.addNum{
-    color: #1F1A4E;
-    font-size: vw(20);
-    // font-weight: bold;
-}
 </style>
 
 <script>
@@ -366,12 +385,12 @@ export default {
       type: 0,
       billList: [],
       typeList: ["收入记录", "支出记录"],
-      tableType: 14,
+      tableType: 5,
       info: {},
       loading: false,
       finished: false,
       page: 0,
-      downTitle: "暂无更多记录"
+      downTitle: "无更多结算记录"
     };
   },
   watch: {
@@ -384,29 +403,29 @@ export default {
         case 6:
           this.downTitle = "无更多活动发放记录";
           break;
+        case 14:
+          this.downTitle = "无更多返还记录";
+          break;
         case 9:
           this.downTitle = "无更多提现记录";
           break;
         case 10:
           this.downTitle = "无更多兑换记录";
           break;
-        case 14:
-          this.downTitle = "暂无更多记录";
-          break;
       }
     }
   },
   components: { navigation },
   created() {
-    document.title = "提现记录";
+    document.title = "金币记录";
     this.getInfo();
-    // this.getList(5);
+    this.getList(5);
     common.initNav({
       type: 1,
       data: {
-        msg: "鉆石记录",
+        msg: "钻石记录",
         link: faqLink,
-        title: "",
+        title: "钻石记录",
         showUrl: faqLink,
         imgUrl: faqLink,
         desc: ""
@@ -427,6 +446,7 @@ export default {
         this.getList(this.tableType);
         return;
       }
+      this.tableType = 5;
       this.getList(this.tableType);
     },
     back() {