修改bug

releaselog.md

@@ -1,5 +1,8 @@
 
 
+# 0.5.4 (21.03.31 18:00) 
+### 优选相关设置
+
 # 0.5.3 (21.03.22 18:00) 
 ### 添加平台  群设置修改bug
 

src/pages.json

@@ -476,7 +476,7 @@
         {
             "path": "pages/assistant/set-time",
             "style": {
-                "navigationBarTitleText": "助理禁言时间"
+                "navigationBarTitleText": "助理工作时间"
             }
         },
         {

src/pages/manage/index.vue

@@ -77,7 +77,7 @@
 
         <!-- <button class="btn" @click="layout">退出登录</button> -->
 
-        <div class="ver">0.5.37</div>
+        <div class="ver">0.5.41</div>
         <wyg-bottom-tab
             ref="tabbar"
             :tabIndex="2"

src/pages/youxuan/good.vue

@@ -191,24 +191,24 @@
                                                     {{ item.name }}
                                                 </div>
                                                 <div class="goods__sale">
-                                                    <span v-if="item.agentFee">
+                                                    <span v-if="item.minPrice">
                                                         价格：￥{{
-                                                            item.agentFee / 100
+                                                            item.minPrice / 100
                                                         }}
                                                     </span>
 
-                                                    <span v-if="item.tagPrice">
-                                                        原价：{{
+                                                    <span v-if="item.tagPrice" class="text-line">
+                                                        原价：￥{{
                                                             item.tagPrice / 100
                                                         }}
                                                     </span>
                                                 </div>
                                                 <div class="goods__sale">
-                                                    <!-- <span v-if="item.agentFee">
+                                                    <span v-if="item.agentFee" class="red">
                                                         赚：￥{{
                                                             item.agentFee / 100
                                                         }}
-                                                    </span> -->
+                                                    </span>
 
                                                     <span
                                                         v-if="
@@ -1585,10 +1585,10 @@ page {
     &__sale {
         font-size: px(38);
         line-height: px(40);
-        color: #999;
+        color: #666;
         margin-top: px(30);
         span ~ span {
-            margin-left: px(20);
+            margin-left: px(40);
         }
     }
 
@@ -2031,4 +2031,13 @@ page {
         text-indent: 2em;
     }
 }
+.text-line{
+    text-decoration: line-through;
+}
+.blod{
+    font-weight: bold;
+}
+.red{
+    color: #ff4b26;
+}
 </style>

src/pages/youxuan/order/detail.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="page">
+    <div class="page" v-if="data">
         <div class="order-info">
             <div class="info">
                 <div class="num">订单号：{{data.orderNo}}</div>
@@ -48,9 +48,9 @@
                     <div class="key key-r">总金额：</div>
                     <div class="value">￥{{data.totalAmount / 100}}</div>
                 </li>
-                <li v-if="data.points">
+                <li>
                     <div class="key">积分抵扣（{{data.points}}分）：</div>
-                    <div class="value">-￥{{data.pointsPrice}}</div>
+                    <div class="value">-￥{{data.pointsPrice / 100}}</div>
                 </li>
                 <li>
                     <div class="key">优惠券：</div>
@@ -64,12 +64,12 @@
                     <div class="key">合计：</div>
                     <div class="value red">￥{{data.amount / 100}}</div>
                 </li>
-                <!-- <li>
+                <li>
                     <div class="key">佣金：</div>
                     <div class="value blod">
-                        ￥50.5（佣金）-￥50.5（积分抵扣）=￥5
+                        ￥{{data.commission/100}}（佣金）-￥{{data.pointsPrice / 100}}（积分抵扣）=￥{{data.amount / 100}}
                     </div>
-                </li> -->
+                </li>
             </ul>
         </section>
         <section class="info-box">
@@ -131,7 +131,7 @@ export default {
     name: "",
     components: { MyImage },
 
-    filter: {
+    filters: {
         orderStatus(v) {
             return statusEnum[v] || "";
         },
@@ -140,7 +140,7 @@ export default {
     data() {
         return {
             dataId: "",
-            data: {},
+            data: null,
         };
     },
 

src/pages/youxuan/order/index.vue

@@ -41,7 +41,7 @@
                         <my-image class="img" :src="order.headIcon"></my-image>
                         <div class="main">
                             <div class="line">
-                                <div class="name">{{ order.nickName }}</div>
+                                <div class="name">{{ order.name }}</div>
                                 <div class="money">
                                     合计：<span class="red-text"
                                         >￥{{ order.amount / 100 }}</span
@@ -98,7 +98,7 @@ let statusEnum = {
 export default {
     name: "",
     components: { MyImage },
-    filter: {
+    filters: {
         orderStatus(v) {
             return statusEnum[v] || "";
         },
@@ -116,6 +116,7 @@ export default {
         };
     },
     onLoad() {
+        
         this.getList();
     },
 

src/pages/youxuan/profit.vue

@@ -2,7 +2,7 @@
     <div class="page">
         <div class="profit-info">
             <h6 class="tit">累计优选佣金</h6>
-            <div class="money">4505.8</div>
+            <div class="money" v-if="dataInfo">{{dataInfo.totalCommission / 100}}</div>
         </div>
 
         <div class="filter">
@@ -25,35 +25,38 @@
         </div>
 
         <ul class="list">
-            <li>
+            <li v-for="item of listData" :key="item.id">
                 <div class="top">
-                    <div class="tit">订单佣金</div>
-                    <div class="money">+12.90</div>
+                    <div class="tit">{{ item.title }}</div>
+                    <div class="money">+{{ item.amount / 100 }}</div>
                 </div>
                 <div class="info">
-                    <div class="date">2021/03/29</div>
-                    <div class="formula">￥16(佣金)-￥2(积分抵扣) = ￥16</div>
+                    <div class="date">
+                        {{ item.createdTime | dateFormat("yyyy-MM-dd hh:mm") }}
+                    </div>
+                    <div class="formula blod">
+                        ￥{{ item.totalCommission / 100 }}(佣金)-￥{{
+                            item.pointsPrice / 100
+                        }}(积分抵扣) = ￥{{ item.amount / 100 }}
+                    </div>
                 </div>
                 <div class="bottom">
-                    <div class="num">订单号：154546464666</div>
-                    <div class="link">查看订单</div>
-                </div>
-            </li>
-            <li>
-                <div class="top">
-                    <div class="tit">订单佣金</div>
-                    <div class="money">+12.90</div>
-                </div>
-                <div class="info">
-                    <div class="date">2021/03/29</div>
-                    <div class="formula">￥16(佣金)-￥2(积分抵扣) = ￥16</div>
-                </div>
-                <div class="bottom">
-                    <div class="num">订单号：154546464666</div>
-                    <div class="link">查看订单</div>
+                    <div class="num">订单号：{{ item.orderNo }}</div>
+                    <div
+                        class="link"
+                        @click="
+                            jump({
+                                path: '/pages/youxuan/order/detail',
+                                query: { id: item.orderId },
+                            })
+                        "
+                    >
+                        查看订单
+                    </div>
                 </div>
             </li>
         </ul>
+        <div class="more-text" v-if="dataEnd">- 没有更多数据了 -</div>
     </div>
 </template>
 
@@ -69,15 +72,86 @@ export default {
                 startDate: "",
                 endDate: "",
             },
+            pageIndex: 1,
+            dataEnd: false,
+            listData: [],
+            dataInfo:null,
         };
     },
-
     onShow() {},
 
+    onLoad() {
+        this.getList();
+        this.getInfo();
+    },
+    onPullDownRefresh() {
+        this.getList(true);
+        this.getInfo();
+    },
+    onReachBottom() {
+        this.getMoreList();
+    },
+
     // 函数
     methods: {
+
+        getInfo(){
+            this.api.get("/Yx/GetProfitInfo").then((res) => {
+                this.dataInfo = res.data;
+            });
+        },
+
+        getList(isPull) {
+            uni.showLoading({
+                title: "加载中...",
+            });
+            this.pageIndex = 1;
+            this.dataEnd = false;
+            let sendData = {
+                pageIndex: this.pageIndex++,
+            };
+            if (this.filter.startDate) {
+                sendData.startTime = this.filter.startDate;
+            }
+            if (this.filter.endDate) {
+                sendData.endTime = this.filter.endDate;
+            }
+            this.api.get("/Yx/GetProfitList", sendData).then((res) => {
+                if (isPull) {
+                    uni.stopPullDownRefresh();
+                }
+                uni.hideLoading();
+                this.listData = res.data;
+                if (!this.listData.length) {
+                    this.dataEnd = true;
+                }
+            });
+        },
+        getMoreList() {
+            uni.showLoading({
+                title: "加载中...",
+            });
+            let sendData = {
+                pageIndex: this.pageIndex++,
+            };
+            if (this.filter.startDate) {
+                sendData.startTime = this.filter.startDate;
+            }
+            if (this.filter.endDate) {
+                sendData.endTime = this.filter.endDate;
+            }
+            this.api.get("/Yx/GetProfitList", sendData).then((res) => {
+                uni.hideLoading();
+                this.listData = [...this.listData, ...res.data];
+                if (!this.listData.length) {
+                    this.dataEnd = true;
+                }
+            });
+        },
+
         dateChange(e, name) {
             this.filter[name] = e.detail.value;
+            this.getList();
         },
     },
 
@@ -133,30 +207,43 @@ export default {
         border-bottom: 1px solid #f1f1f1;
         padding: px(30) px(40);
     }
-    .top,.info,.bottom{
+    .top,
+    .info,
+    .bottom {
         display: flex;
         align-items: center;
         justify-content: space-between;
     }
-    .tit{
+    .tit {
         font-size: px(48);
     }
-    .money{
-        color:#ff4b26;
+    .money {
+        color: #ff4b26;
     }
-    .info,.bottom{
+    .info,
+    .bottom {
         font-size: px(40);
         color: #666;
         margin-top: px(10);
     }
-    .formula{
+    .formula {
         font-weight: bold;
     }
-    .link{
+    .link {
         color: #4395ff;
     }
-    .num{
+    .num {
         color: #999;
     }
 }
+.blod {
+    font-weight: bold;
+}
+.more-text {
+    display: flex;
+    justify-content: center;
+    padding-bottom: px(60);
+    font-size: px(34);
+    color: #999;
+}
 </style>