瀏覽代碼

信息显示调整

xialei 1 年之前
父節點
當前提交
c96de55f94

+ 1 - 1
src/components/cards/redPoint.vue

@@ -33,7 +33,7 @@
33 33
               </div>
34 34
             </div>
35 35
             <div class="card_box_txt_right">
36
-              <span class="sp1" v-text="subItem.name" /><span class="sp2" v-text="subItem.count || 0" />
36
+              <span class="sp1" v-text="subItem.name" /><span class="sp1" v-text="subItem.count || 0" />
37 37
             </div>
38 38
 
39 39
 

+ 3 - 35
src/views/accounts/caiwutongji/commission/index.vue

@@ -39,26 +39,8 @@
39 39
 
40 40
                             </el-select>
41 41
                         </el-form-item>
42
-                        <el-form-item class="selected-kuang" label="名称:">
43
-                            <el-select
44
-                                v-model="tableFrom.commission_type"
45
-                                class="filter-item"
46
-                                placeholder="全部"
47
-                                @change="getList(1)"
48
-                            >
49
-                                <el-option value="" label="全部"/>
50
-                                <el-option :value="3" label="直推奖"/>
51
-                                <el-option :value="16" label="大V分享奖"/>
52
-                                <el-option :value="14" label="推荐代理收益"/>
53
-                                <el-option :value="10" label="推荐创客收益"/>
54
-                                <el-option :value="4" label="推荐区域收益"/>
55
-                                <el-option :value="12" label="区县代区域收益"/>
56
-                                <el-option :value="20" label="省级代理区域收益"/>
57
-                                <el-option :value="15" label="邀请V客升级奖"/>
58
-                                <el-option :value="7" label="跨店奖励"/>
59
-                                <el-option :value="19" label="创客实际补贴"/>
60
-                            </el-select>
61
-                        </el-form-item>
42
+
43
+                      
62 44
 
63 45
                         <el-form-item class="selected-kuang" label="状态:">
64 46
                             <el-select
@@ -114,21 +96,7 @@
114 96
                 <el-table-column label="创建时间" min-width="100" prop="create_time"/>
115 97
                 <el-table-column label="用户昵称" min-width="130" prop="nickname"/>
116 98
                 <el-table-column label="用户账号(手机号)" min-width="130" prop="phone"/>
117
-                <el-table-column label="名称" min-width="130" prop="commission_type">
118
-                  <template slot-scope="scope">
119
-                      <span v-if="scope.row.commission_type == 3"> 直推奖 </span>
120
-                      <span v-if="scope.row.commission_type == 16"> 大V分享奖 </span>
121
-                      <span v-if="scope.row.commission_type == 14"> 推荐代理收益 </span>
122
-                      <span v-if="scope.row.commission_type == 10"> 推荐创客收益 </span>
123
-                      <span v-if="scope.row.commission_type == 4"> 推荐区域收益 </span>
124
-                      <span v-if="scope.row.commission_type == 12"> 区县代区域收益 </span>
125
-                      <span v-if="scope.row.commission_type == 20"> 省级代理区域收益 </span>
126
-                      <span v-if="scope.row.commission_type == 15"> 邀请V客升级奖 </span>
127
-                      <span v-if="scope.row.commission_type == 7"> 跨店奖励 </span>
128
-                      <span v-if="scope.row.commission_type == 19"> 创客实际补贴 </span>
129
-
130
-                  </template>
131
-                </el-table-column>
99
+      
132 100
                 <el-table-column label="金额(元)" min-width="130" prop="number"/>
133 101
                 <el-table-column label="状态" min-width="130" >
134 102
                   <template slot-scope="scope">

+ 6 - 2
src/views/order/list/index.vue

@@ -106,7 +106,9 @@
106 106
             </el-form-item>
107 107
           </el-form>
108 108
         </div>
109
-        <cards-data :card-lists="cardLists" />
109
+        <!-- <cards-data :card-lists="cardLists" /> -->
110
+        <redCards-data :card-lists="cardLists" class="orderCount-box" />
111
+        <!-- <otherCards-data :card-lists="cardLists" class="orderCount-box"/> -->
110 112
       </div>
111 113
       <el-table
112 114
         v-loading="listLoading"
@@ -265,9 +267,11 @@ import { orderListApi, chartApi } from "@/api/order";
265 267
 import { merSelectApi } from "@/api/product";
266 268
 import detailsFrom from "./orderDetail";
267 269
 import cardsData from "@/components/cards/index";
270
+import otherCardsData from "@/components/cards/other";
271
+import redCardsData from "@/components/cards/redPoint";
268 272
 import { fromList } from "@/libs/constants.js";
269 273
 export default {
270
-  components: { detailsFrom, cardsData },
274
+  components: { redCardsData,otherCardsData,detailsFrom, cardsData },
271 275
   data() {
272 276
     return {
273 277
       orderId: 0,