更新

pages/main/index/orders.vue

@@ -22,18 +22,6 @@
             </el-select>
           </div>
         </div>
-        <!-- <div class="type-boxs">
-          <span class="vsub">交易类型:</span>
-          <div class="inlineb">
-            <el-checkbox-group v-model="tradeType" @change="changeTrade" size="mini">
-              <el-checkbox-button
-                v-for="itm in tradeList"
-                :label="itm.id"
-                :key="itm.id"
-              >{{itm.type}}</el-checkbox-button>
-            </el-checkbox-group>
-          </div>
-        </div>-->
         <div class="type-boxs">
           <span class="vsub">支付方式:</span>
           <div class="inlineb">
@@ -97,16 +85,6 @@
           </div>
           <div class="inlineb">
             <span class>项目:</span>
-            <!-- <div class="inlineb">
-              <el-select v-model="productTypes" placeholder>
-                <el-option
-                  v-for="item of productTypesOption"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                ></el-option>
-              </el-select>
-            </div>-->
             <div class="inlineb">
               <el-input style="width: 100px;" type="number" v-model="productId" placeholder="项目ID"></el-input>
             </div>
@@ -127,58 +105,38 @@
               支出金额：
               <span class="orange">{{PayCount}}元(成功{{paySuccess}}元)</span>
             </span>
+            ,
+            <span>
+              冻结金额：
+              <span class="orange">{{frozenSum}}元(成功{{frozenSuccessSum}}元)</span>
+            </span>
           </div>
         </div>
       </section>
     </section>
-    <!-- <section class="selector-box">
-      <section class="selector-box-left">
-        <el-select v-model="status" placeholder="项目状态">
-          <el-option
-            v-for="item of jobStatusList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-        <el-select v-model="period" placeholder="账单状态">
-          <el-option
-            v-for="item of periodStatusList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-        <el-input style="width: 200px;" v-model="checkUser" placeholder="负责人"></el-input>
-        <el-input style="width: 200px;" v-model="jobID" placeholder="项目ID"></el-input>
-        <el-button @click="clickSearchConfirm">确认</el-button>
-      </section>
-      <el-button @click="clickExport" type="primary">导出</el-button>
-    </section>-->
+
     <div class="trcenter changeheight" width="100%">
       <!-- height="250" -->
       <el-table :data="finaceList" border height="100%" width="100%">
         <el-table-column label="订单名称">
           <template slot-scope="scope">
-            <!-- @click="clickDev(scope.row.uid)"  -->
-
             <span class="lblue point">
-              <nuxt-link
-                :to="{path:'/main/orders_detail?id='+scope.row.order_no}"
-              >{{scope.row.product_title}}</nuxt-link>
+              <nuxt-link target="_blank" :to="{path:'/main/orders_detail?id='+scope.row.order_no}">{{scope.row.product_title}}</nuxt-link>
             </span>
           </template>
         </el-table-column>
         <el-table-column label="用户">
-          <template slot-scope="scope">{{scope.row.user_info.nickname}}({{scope.row.uid }})</template>
+          <template slot-scope="scope"><a :href="scope.row.user_url" target="_blank">{{scope.row.user_info.nickname}}({{scope.row.uid }})</a> </template>
         </el-table-column>
         <el-table-column label="实际金额">
           <template slot-scope="scope">
-            <span
-              v-if="parseInt(scope.row.real_amount)>=0"
-              class="green"
-            >+{{(scope.row.real_amount/100).toFixed(2)}}</span>
-            <span v-else class="orange">{{(scope.row.real_amount/100).toFixed(2)}}</span>
+            <div v-if="scope.row.order_type!=6">
+              <span v-if="parseInt(scope.row.real_amount)>=0" class="green">+{{(scope.row.real_amount/100).toFixed(2)}}</span>
+              <span v-else class="orange">{{(scope.row.real_amount/100).toFixed(2)}}</span>
+            </div>
+            <div v-else>
+              <span>{{(scope.row.real_amount/100).toFixed(2)}}</span>
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="channel_name" label="支付方式"></el-table-column>
@@ -212,7 +170,7 @@
         </el-table-column>
         <el-table-column label="关联项目">
           <template slot-scope="scope">
-            <a :href="scope.row.related_project.url?scope.row.related_project.url:'#'">
+            <a :href="scope.row.related_project.url?scope.row.related_project.url:'#'" target="_blank">
               <span
                 class="lblue"
               >{{scope.row.related_project.name?scope.row.related_project.name:"--"}}</span>
@@ -246,6 +204,8 @@
 export default {
   data() {
     return {
+      frozenSuccessSum:0,
+      frozenSum:0,
       finaceList: [],
       successCount: 0,
       totalHave: 0,
@@ -868,7 +828,7 @@ export default {
       }
 
       let body = {
-        // 1111
+        view:'platform',
         product_type: arr1,
         order_type: this.orderTypes,
         channel: arr2,
@@ -895,6 +855,8 @@ export default {
       this.PayCount = data.expense_sum;
       // this.totalCount = data.count;
       this.paySuccess = data.expense_success_sum;
+      this.frozenSum=data.frozen_sum;
+      this.frozenSuccessSum=data.frozen_success_sum;
     },
     async getAllChice() {
       let body = {};