up

dist/_nuxt/6a1edba1619cd32fe234.css

@@ -1 +0,0 @@
-.user-info[data-v-374f143a],.user-name[data-v-374f143a]{margin-bottom:10px}.order-footer[data-v-374f143a]{margin-top:20px}.product_title[data-v-374f143a]{overflow:hidden;-webkit-line-clamp:1;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical}#mainBody[data-v-374f143a]{white-space:nowrap;overflow-x:scroll;height:calc(100% - 40px)}.orange[data-v-374f143a]{color:#ff9800}.red[data-v-374f143a]{color:#ff021e}.green[data-v-374f143a]{color:#259b24}

dist/_nuxt/78afc7638e5d5c5040f5.css

@@ -0,0 +1 @@
+.user-info[data-v-7df957af],.user-name[data-v-7df957af]{margin-bottom:10px}.order-footer[data-v-7df957af]{margin-top:20px}.product_title[data-v-7df957af]{overflow:hidden;-webkit-line-clamp:1;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical}#mainBody[data-v-7df957af]{white-space:nowrap;overflow-x:scroll;height:calc(100% - 40px)}.orange[data-v-7df957af]{color:#ff9800}.red[data-v-7df957af]{color:#ff021e}.green[data-v-7df957af]{color:#259b24}

pages/main/index/orders.vue

@@ -92,6 +92,12 @@
               <el-input style="width: 100px;" type="number" v-model="productId" placeholder="项目ID"></el-input>
             </div>
           </div>
+          <div class="inlineb">
+            <span class="vsub">最小金额:</span>
+            <div class="inlineb">
+              <el-input style="width: 100px;" type="number" v-model="minRealAmount" placeholder="最小实付金额"></el-input>
+            </div>
+          </div>
 
           <el-button type="primary" @click="getFinanceList">筛选</el-button>
           <el-button @click="downFinanceList" class="export-excel" type="primary">导出报表</el-button>
@@ -497,6 +503,7 @@ export default {
       PayCount: 0,
       paySuccess: 0,
       productId: "",
+      minRealAmount: "",
       productType: [0],
       orderTypes: "",
       orderTypesOption: [],
@@ -1013,6 +1020,7 @@ export default {
         order: this.searchId,
         user: this.checkUser,
         product_id: this.productId,
+        min_real_amount: this.minRealAmount ? this.minRealAmount * 100 : 0,
         page: this.currentPage,
         page_size: this.currentPageSize
       };

pages/main/index/user_bills.vue

@@ -1,10 +1,28 @@
 <template>
   <div id="mainBody">
     <div v-if="user">
-      <div class="user-name">用户：{{user.nickname}}({{user.uid}})</div>
+      <div class="user-name">用户：{{ user.nickname }}({{ user.uid }})</div>
       <div
         class="user-info"
-      >订单数量：{{totalCount}}，收入金额：{{income_success_sum}}元，支出金额：{{expense_success_sum}}元，客栈账户余额 {{balance}}元，薪资账户余额 {{recharge}}元，冻结余额 {{income}}元</div>
+      >订单数量：{{ totalCount }}，收入金额：{{ income_success_sum }}元，支出金额：{{ expense_success_sum }}元，客栈账户余额 {{ balance }}元，薪资账户余额
+        {{ recharge }}元，冻结余额 {{ income }}元
+      </div>
+      <section style="margin-bottom: 12px;">
+        <div class="inlineb">
+          <span class="vsub">状态:</span>
+          <div class="inlineb">
+            <el-select v-model="orderState" clearable placeholder style="width: 140px;">
+              <el-option
+                v-for="(item,idx) in orderStateOption"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </div>
+        </div>
+        <el-button type="primary" @click="getFinanceList">筛选</el-button>
+      </section>
       <el-table :data="finaceList" border style="width: 100%">
         <el-table-column prop label="订单名称">
           <template slot-scope="scope">
@@ -12,7 +30,7 @@
               <nuxt-link
                 target="_blank"
                 :to="{path:'/main/orders_detail?id='+scope.row.order_no}"
-              >{{scope.row.product_title}}</nuxt-link>
+              >{{ scope.row.product_title }}</nuxt-link>
             </span>
           </template>
         </el-table-column>
@@ -26,165 +44,165 @@
                 <!--退款-->
                 <span
                   v-if="scope.row.order_type == 8"
-                >{{(scope.row.real_amount).toFixed(2)}}
+                >{{ (scope.row.real_amount).toFixed(2) }}
               </span>
-                <template  v-else-if="scope.row.order_type == 4">
+                <template v-else-if="scope.row.order_type == 4">
                   <!--如果不是余额购买-->
                   <span v-if="scope.row.channel != 'balance'" class="red">
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                   <span v-else>
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                 </template>
-                <span v-else>{{(scope.row.real_amount).toFixed(2)}}</span>
+                <span v-else>{{ (scope.row.real_amount).toFixed(2) }}</span>
               </div>
               <!--            提现-->
               <div v-else-if="scope.row.product_type == 200">
-                <span  class="green">
-                  {{(scope.row.real_amount).toFixed(2)}}
+                <span class="green">
+                  {{ (scope.row.real_amount).toFixed(2) }}
                 </span>
               </div>
               <!--            充值-->
               <div v-else-if="scope.row.product_type == 3">
                 <div v-if="scope.row.operator_uid==41266">
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </div>
                 <div v-else>
-                  <span class="red">+{{(scope.row.real_amount).toFixed(2)}}</span>
+                  <span class="red">+{{ (scope.row.real_amount).toFixed(2) }}</span>
                 </div>
               </div>
               <!--            扣款-->
               <div v-else-if="scope.row.product_type == 300">
                 <div v-if="scope.row.operator_uid==41266">
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </div>
                 <div v-else>
-                  <span class="red">+{{(scope.row.real_amount).toFixed(2)}}</span>
+                  <span class="red">+{{ (scope.row.real_amount).toFixed(2) }}</span>
                 </div>
               </div>
               <!--            云端意向金-->
               <div v-else-if="scope.row.product_type == 8">
                 <!--如果不是余额购买-->
                 <span v-if="scope.row.channel != 'balance'" class="red">
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                 <span v-else>
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
               </div>
               <!--            雇佣-->
               <div v-else-if="scope.row.product_type == 4">
                 <!--退款-->
-                <span v-if="scope.row.order_type == 8" >{{(scope.row.real_amount).toFixed(2)}}</span>
+                <span v-if="scope.row.order_type == 8">{{ (scope.row.real_amount).toFixed(2) }}</span>
                 <!--结薪-->
-                <span v-else-if="scope.row.order_type == 5" >{{(scope.row.real_amount).toFixed(2)}}</span>
-                <template  v-else-if="scope.row.order_type == 4 || scope.row.order_type == 1">
+                <span v-else-if="scope.row.order_type == 5">{{ (scope.row.real_amount).toFixed(2) }}</span>
+                <template v-else-if="scope.row.order_type == 4 || scope.row.order_type == 1">
                   <!--如果不是余额购买-->
                   <span v-if="scope.row.channel != 'balance'" class="red">
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                   <span v-else>
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                 </template>
-                <span v-else>{{(scope.row.real_amount).toFixed(2)}}</span>
+                <span v-else>{{ (scope.row.real_amount).toFixed(2) }}</span>
               </div>
               <!--            云端押金-->
               <div v-else-if="scope.row.product_type == 400">
                 <!--退款-->
-                <span v-if="scope.row.order_type == 8" >{{(scope.row.real_amount).toFixed(2)}}</span>
-                <template  v-else-if="scope.row.order_type == 1">
+                <span v-if="scope.row.order_type == 8">{{ (scope.row.real_amount).toFixed(2) }}</span>
+                <template v-else-if="scope.row.order_type == 1">
                   <!--如果不是余额购买-->
                   <span v-if="scope.row.channel != 'balance'" class="red">
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                   <span v-else>
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                 </template>
-                <span v-else>{{(scope.row.real_amount).toFixed(2)}}</span>
+                <span v-else>{{ (scope.row.real_amount).toFixed(2) }}</span>
               </div>
               <!--            云端工作-->
               <div v-else-if="scope.row.product_type == 9">
                 <!--退款-->
-                <span v-if="scope.row.order_type == 8" >{{(scope.row.real_amount).toFixed(2)}}</span>
+                <span v-if="scope.row.order_type == 8">{{ (scope.row.real_amount).toFixed(2) }}</span>
                 <!--结薪-->
-                <template  v-else-if="scope.row.order_type == 5">
+                <template v-else-if="scope.row.order_type == 5">
                   <!--如果不是余额购买-->
-                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" >
-                  {{(scope.row.real_amount).toFixed(2)}}
+                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'">
+                  {{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                   <span v-else>
-                  {{(scope.row.real_amount).toFixed(2)}}
+                  {{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                 </template>
                 <!--托管-->
-                <template  v-else-if="scope.row.order_type == 1">
+                <template v-else-if="scope.row.order_type == 1">
                   <!--如果不是余额购买-->
                   <span v-if="scope.row.channel != 'balance'" class="red">
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                   <span v-else>
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                 </template>
-                <span v-else>{{(scope.row.real_amount).toFixed(2)}}</span>
+                <span v-else>{{ (scope.row.real_amount).toFixed(2) }}</span>
               </div>
               <!--            整包-->
               <div v-else-if="scope.row.product_type == 2">
                 <!--退款-->
-                <span v-if="scope.row.order_type == 8" >{{(scope.row.real_amount).toFixed(2)}}</span>
+                <span v-if="scope.row.order_type == 8">{{ (scope.row.real_amount).toFixed(2) }}</span>
                 <!--结薪-->
-                <template  v-else-if="scope.row.order_type == 5">
+                <template v-else-if="scope.row.order_type == 5">
                   <!--如果不是余额购买-->
-                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" >
-                  {{(scope.row.real_amount).toFixed(2)}}
+                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'">
+                  {{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                   <span v-else>
-                  {{(scope.row.real_amount).toFixed(2)}}
+                  {{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                 </template>
                 <!--托管-->
-                <template  v-else-if="scope.row.order_type == 1">
+                <template v-else-if="scope.row.order_type == 1">
                   <!--如果不是余额购买-->
                   <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" class="red">
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                   <span v-else>
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                 </template>
                 <!--解冻-->
-                <template  v-else-if="scope.row.order_type == 7">
+                <template v-else-if="scope.row.order_type == 7">
                   <!--如果不是余额购买-->
                   <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" class="green">
-                  {{(scope.row.real_amount).toFixed(2)}}
+                  {{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                   <span v-else>
-                  {{(scope.row.real_amount).toFixed(2)}}
+                  {{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                 </template>
-                <span v-else>{{(scope.row.real_amount).toFixed(2)}}</span>
+                <span v-else>{{ (scope.row.real_amount).toFixed(2) }}</span>
               </div>
               <!--            查看机会-->
               <div v-else-if="scope.row.product_type == 1">
                 <!--如果不是余额购买-->
                 <span v-if="scope.row.channel != 'balance'" class="red">
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                 <span v-else>
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
               </div>
               <!--            其他-->
               <div v-else>
                 <!--如果不是余额购买-->
                 <span v-if="scope.row.channel != 'balance'" class="red">
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
                 <span v-else>
-                  +{{(scope.row.real_amount).toFixed(2)}}
+                  +{{ (scope.row.real_amount).toFixed(2) }}
                 </span>
               </div>
             </template>
@@ -193,47 +211,55 @@
                   <span
                     v-if="parseInt((scope.row.real_amount).toFixed(2))>0"
                     class="red"
-                  >+{{(scope.row.real_amount).toFixed(2)}}</span>
-                <span v-else-if="parseInt((scope.row.real_amount).toFixed(2)) == 0">{{(scope.row.real_amount).toFixed(2)}}</span>
-                <span v-else class="green">{{(scope.row.real_amount).toFixed(2)}}</span>
+                  >+{{ (scope.row.real_amount).toFixed(2) }}</span>
+                <span
+                  v-else-if="parseInt((scope.row.real_amount).toFixed(2)) == 0">{{
+                    (scope.row.real_amount).toFixed(2)
+                  }}</span>
+                <span v-else class="green">{{ (scope.row.real_amount).toFixed(2) }}</span>
               </div>
               <div v-else>
                 <span
                   v-if="parseInt((scope.row.real_amount).toFixed(2))>0"
-                >+{{(scope.row.real_amount).toFixed(2)}}</span>
-                <span v-else-if="parseInt((scope.row.real_amount).toFixed(2)) == 0">{{(scope.row.real_amount).toFixed(2)}}</span>
-                <span v-else>{{(scope.row.real_amount).toFixed(2)}}</span>
+                >+{{ (scope.row.real_amount).toFixed(2) }}</span>
+                <span
+                  v-else-if="parseInt((scope.row.real_amount).toFixed(2)) == 0">{{
+                    (scope.row.real_amount).toFixed(2)
+                  }}</span>
+                <span v-else>{{ (scope.row.real_amount).toFixed(2) }}</span>
               </div>
             </template>
           </template>
         </el-table-column>
         <el-table-column prop label="当前余额">
-          <template slot-scope="scope">{{scope.row.total_balance?scope.row.total_balance:'--'}}</template>
+          <template slot-scope="scope">{{ scope.row.total_balance ? scope.row.total_balance : '--' }}</template>
         </el-table-column>
         <el-table-column prop label="支付方式">
-          <template slot-scope="scope">{{scope.row.channel_name}}</template>
+          <template slot-scope="scope">{{ scope.row.channel_name }}</template>
         </el-table-column>
         <el-table-column prop label="订单状态">
-          <template slot-scope="scope">{{scope.row.order_state_name}}</template>
+          <template slot-scope="scope">{{ scope.row.order_state_name }}</template>
         </el-table-column>
         <el-table-column prop label="创建时间">
-          <template slot-scope="scope">{{scope.row.created_at_name}}</template>
+          <template slot-scope="scope">{{ scope.row.created_at_name }}</template>
         </el-table-column>
         <el-table-column prop label="订单编号">
           <template slot-scope="scope">
             <nuxt-link
               target="_blank"
               :to="{path:'/main/orders_detail?id='+scope.row.order_no}"
-            >{{scope.row.order_no}}</nuxt-link>
+            >{{ scope.row.order_no }}
+            </nuxt-link>
           </template>
         </el-table-column>
         <el-table-column prop label="人工">
           <template
             slot-scope="scope"
-          >{{(scope.row.artificial_mark === 1 || scope.row.artificial_mark === "1")?'是':'否'}}</template>
+          >{{ (scope.row.artificial_mark === 1 || scope.row.artificial_mark === "1") ? '是' : '否' }}
+          </template>
         </el-table-column>
         <el-table-column prop label="备注说明">
-          <template slot-scope="scope">{{scope.row.public_comment}}</template>
+          <template slot-scope="scope">{{ scope.row.public_comment }}</template>
         </el-table-column>
       </el-table>
     </div>
@@ -257,6 +283,7 @@ export default {
   data() {
     return {
       user: {},
+      orderState: 0,
       tradeList: [
         {
           id: 0,
@@ -294,10 +321,15 @@ export default {
       currentPageSize: 20,
       // 列表数据
       tableData: [],
-      balance:0,
-      income:0,
-      recharge:0
-
+      balance: 0,
+      income: 0,
+      recharge: 0,
+      orderTypesOption: [],
+      orderStateOption: [],
+      payList: [],
+      payListPop: [],
+      productTypePop: [],
+      TypeList: [],
     };
   },
   computed: {
@@ -306,12 +338,12 @@ export default {
     }
   },
   mounted() {
-    // this.getTableData();
+    this.getAllChoice();
     this.getFinanceList();
   },
   methods: {
     clickDev(uid) {
-      this.$router.push({ path: "/main/orders_detail", params: { id: uid } });
+      this.$router.push({path: "/main/orders_detail", params: {id: uid}});
     },
     changePageSize(val) {
       this.getFinanceList();
@@ -322,7 +354,8 @@ export default {
       let body = {
         page: this.currentPage,
         page_size: this.currentPageSize,
-        user: this.$route.query.user
+        user: this.$route.query.user,
+        status: this.orderState,
       };
       const res = await this.$post("/api/admin/order/get_user_orders", body);
       var data = res.data;
@@ -352,6 +385,42 @@ export default {
         "artificial_mark=1";
       console.log(url);
       window.location.href = url;
+    },
+    async getAllChoice() {
+      let body = {};
+      const res = await this.$post("/api/admin/order/get_all_choice");
+      let data = res.data;
+      this.orderTypesOption = data.order_types;
+      this.orderTypesOption.unshift({
+        id: "",
+        name: "全部"
+      });
+      this.orderStateOption = data.order_state;
+      console.log(this.orderStateOption)
+      this.payList = data.channels;
+      this.payList.unshift({
+        id: 0,
+        name: "全部"
+      });
+      this.payListPop[0] = this.payList.pop();
+      this.payListPop[1] = this.payList.pop();
+      this.payListPop[2] = this.payList.pop();
+      this.payList.push({
+        id: "扩展",
+        name: ">>"
+      });
+      this.TypeList = data.product_types;
+      this.TypeList.unshift({
+        id: 0,
+        name: "全部"
+      });
+      for (let i = 0; i < 10; i++) {
+        this.productTypePop[i] = this.TypeList.pop();
+      }
+      this.TypeList.push({
+        id: "扩展",
+        name: ">>"
+      });
     }
   }
 };
@@ -380,17 +449,21 @@ export default {
   display: -webkit-box;
   -webkit-box-orient: vertical;
 }
+
 #mainBody {
   white-space: nowrap;
   overflow-x: scroll;
   height: calc(100% - 40px);
 }
+
 .orange {
   color: rgba(255, 152, 0, 1);
 }
-.red{
+
+.red {
   color: rgb(255, 2, 30);
 }
+
 .green {
   color: rgba(37, 155, 36, 1);
 }