cps：粉丝列表

htmldev/cps/src/api/request.js

@@ -53,7 +53,7 @@ request.interceptors.request.use(request => {
 
   // 因为微信开发者工具重复授权，本地开发时写死
   if (/^(0|192|10|localhost)/.test(domain)) {
-    request.headers.wechatToken = '25e4dc52bab5d5726fc7c14cf7dfdfec'
+    request.headers.wechatToken = '653c2f9e8952b08d2c40e859a21713a1'
   } else {
     request.headers.wechatToken = getCookieValue('fanbutingwechatToken')
   }

htmldev/cps/src/main.js

@@ -33,3 +33,4 @@ new Vue({
     window.SITE_CONFIG.storeState = cloneDeep(store.state)
   }
 }).$mount('#app')
+// TODO 生成支付二维码

htmldev/cps/src/store/modules/common.js

@@ -6,6 +6,7 @@ const state = {
     user_nickname: '', // 用户昵称
     user_sex: '', // 用户性别
     user_balance: '', // 用户可提现余额(单位为分)
+    user_crash_balance: '', // 累计提现(单位为分)
     user_unreceive_balance: '', // 用户未结算金额(单位为分
     created_at: '' // 注册时间
   },

htmldev/cps/src/views/bill/child/main.vue

@@ -18,15 +18,20 @@
             class="van-loading__text">下拉刷新</span>
         </div>
       </li>
+      <!--TODO 提现有状态-->
       <li
         v-for="(item, index) in list"
         :key="index"
         class="list-item border-bottom-1px">
         <div class="wrap">
-          <p class="label">提现金额：</p>
-          <p class="money">-￥3000,00</p>
+          <p class="label">{{ ['', '收入', '支出'][item.finance_type] }}金额：</p>
+          <p class="money">{{ item.finance_type === 1 ? '+' : '-'}}￥{{ item.finance_balance | fen2Yuan}}</p>
         </div>
-        <p class="date">提现时间：2020-12-23 19:30</p>
+        <div class="wrap">
+          <p class="label">提现状态：</p>
+          <p class="money">{{ ['提现中', '已到账', '提现失败'][item.cash_status] }}</p>
+        </div>
+        <p class="date">创建时间：{{ item.created_at }}</p>
       </li>
       <li class="pullup-wrapper">
         <van-loading

htmldev/cps/src/views/fans/child/main.vue

@@ -29,7 +29,7 @@
             </div>
             <p class="name">{{ item.user_nickname }}</p>
           </div>
-          <p class="status">未激活</p>
+          <p class="status">{{ ['', '未激活', '已激活'][fansType] }}</p>
         </div>
         <p class="date">加入时间：{{ item.created_at }}</p>
       </li>

htmldev/cps/src/views/marketing/make/index.vue

@@ -19,6 +19,7 @@
             class="van-loading__text">下拉刷新</span>
           </div>
         </li>
+        <!--todo 订单状态 commission_status-->
         <li
           v-for="(item, index) in list"
           :key="index"

htmldev/cps/src/views/marketing/return/index.vue

@@ -25,12 +25,13 @@
           class="list-item">
           <div class="wrap">
             <p class="shop">{{ item.order_title }}</p>
+            <!--todo 订单状态 commission_status-->
             <p class="money">
               <span>返</span>
               <span>{{ item.order_commission | fen2Yuan }}</span>
             </p>
           </div>
-          <p class="date">2021-08-21</p>
+          <p class="date">{{ item.created_at }}</p>
         </li>
         <li class="pullup-wrapper">
           <van-loading

htmldev/cps/src/views/order/child/main.vue

@@ -24,8 +24,8 @@
         class="list-item border-bottom-1px"
         @click="getOrderDetail(item.order_number)">
         <div class="wrap">
-          <p class="label">提现金额：</p>
-          <p class="money">-￥3000,00</p>
+          <p class="label">{{ item.product_name }}：</p>
+          <p class="money">+￥3000,00</p>
         </div>
         <p class="date">提现时间：2020-12-23 19:30</p>
       </li>

htmldev/cps/src/views/order/index.vue

@@ -26,7 +26,7 @@
       <div class="fbt-van-popup-body">
         <h3>订单详情</h3>
         <p>
-          <span class="label" style="color: #333333;">{{ orderDetail.order_platform_son_type }}</span>
+          <span class="label" style="color: #333333;">{{ orderDetail.product_name }}</span>
           <span class="value"></span>
         </p>
         <p>
@@ -42,12 +42,14 @@
         </p>
         <p>
           <span class="label">支付金额：</span>
-          <span class="value">￥{{ orderDetail.order_price | fen2Yuan }}</span>
+          <span class="value">￥{{ orderDetail.order_realy_price | fen2Yuan }}</span>
         </p>
         <p>
           <span class="label">预计收益：</span>
           <span class="value" style="color: #FA4A4A;">￥{{ orderDetail.order_commission | fen2Yuan }}</span>
         </p>
+        <!--TODO 加字段：订单平台类型-->
+        <!--TODO 全部退款、部分退款时展示字段：退款时间、退款金额-->
         <p class="status">{{ ['未支付', '已支付', '已收获', '已结算', '全部退款或风控', '部分退款', '已取消'][orderDetail.order_status] }}</p>
       </div>
     </van-popup>

htmldev/cps/src/views/wallet/index.vue

@@ -18,7 +18,7 @@
       <li>
         <p class="left">
           <span class="label">累计提现(元)</span>
-          <span class="value">todo</span>
+          <span class="value">{{ userInfo.user_crash_balance | fen2Yuan }}</span>
         </p>
         <p class="right">
           <span class="label">待结算佣金(元)</span>

htmldev/cps/src/views/withdrawCash/api/api.js

@@ -4,9 +4,9 @@ import request from '@/api/request'
  * 提现
  */
 export const apiUserCash = (amount) => request({
-  method: 'GET',
+  method: 'POST',
   url: '/api/user/cash',
-  params: {
+  data: {
     amount
   }
 })

htmldev/cps/src/views/withdrawCash/index.vue

@@ -32,7 +32,7 @@
 import { Field, Button, Toast } from 'vant'
 import { apiUserCash } from './api/api'
 import { yuan2Fen } from '@/utils'
-
+// todo 点击全部提现把钱包余额的值传过来，提现接口调用成功，刷新用户信息接口
 export default {
   name: 'index',
   components: {