修改bug

a.txt

@@ -31,4 +31,8 @@ f68b8e48-c681-467b-af76-e1612c26d62e 主播 主播人员
 xkjsglsadmin/xkjsgls2020
 
 小客家水果
-xkjsgadmin／xkjsg2020
+xkjsgadmin／xkjsg2020
+
+史各庄
+13522911031 / 123456
+

src/common/js/plugin.js

@@ -402,7 +402,7 @@ export default {
      * @param format
      * @returns {string}
      */
-    dateFormat(date, format = 'yyyy-MM-dd') {
+     dateFormat(date, format = 'yyyy-MM-dd') {
         if (date) {
             date = date.replace(/-/g, '/')
             date = new Date(Date.parse(date))
@@ -417,6 +417,38 @@ export default {
                 'q+': Math.floor((date.getMonth() + 3) / 3), //季度
             }
 
+            if (/(y+)/.test(format)) {
+                format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+            }
+            for (let k in o) {
+                if (new RegExp('(' + k + ')').test(format)) {
+                    format = format.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+                }
+            }
+            return format
+        } else {
+            return ''
+        }
+    },
+    /**
+     * 转化为指定格式日期
+     * @param date
+     * @param format
+     * @returns {string}
+     */
+    dateFormat2(date, format = 'yyyy-MM-dd') {
+        if (date) {
+
+            let o = {
+                'M+': date.getMonth() + 1, //月份
+                'd+': date.getDate(), //日
+                'h+': date.getHours(), //小时
+                'm+': date.getMinutes(), //分
+                's+': date.getSeconds(), //秒
+                'S': date.getMilliseconds(), //毫秒
+                'q+': Math.floor((date.getMonth() + 3) / 3), //季度
+            }
+
             if (/(y+)/.test(format)) {
                 format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
             }

src/pages/manage/index.vue

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

src/pages/youxuan/order/detail.vue

@@ -2,39 +2,51 @@
     <div class="page" v-if="data">
         <div class="order-info">
             <div class="info">
-                <div class="num">订单号：{{data.orderNo}}</div>
-                <div class="status">{{data.status | orderStatus}}</div>
+                <div class="num">订单号：{{ data.orderNo }}</div>
+                <div class="status">{{ data.status | orderStatus }}</div>
             </div>
             <div class="con">
                 <my-image :src="data.headIcon" class="img"></my-image>
                 <div class="main">
                     <div class="line">
                         <div class="name">
-                            {{data.nickName}}
+                            {{ data.nickName }}
                         </div>
                         <div class="money">
-                            合计：<span class="red-text">￥{{data.amount / 100}}</span>
+                            合计：<span class="red-text"
+                                >￥{{ data.amount / 100 }}</span
+                            >
                         </div>
                     </div>
                     <div class="line">
-                        <div class="time"> {{ data.orderTime | dateFormat("hh:mm") }}</div>
-                        <div class="money">预估佣金：￥{{data.estimateComission / 100}}</div>
+                        <div class="time">
+                            {{ data.orderTime | dateFormat("hh:mm") }}
+                        </div>
+                        <div class="money">
+                            预估佣金：￥{{ data.estimateComission / 100 }}
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
         <ul class="good-list">
-            <li v-for="(item,index) of data.orderItems" :key="index">
+            <li v-for="(item, index) of data.orderItems" :key="index">
                 <my-image class="good-img" :src="item.productImage"></my-image>
                 <div class="good-con">
-                    <div class="good-name">{{item.productName}}</div>
+                    <div class="good-name">{{ item.productName }}</div>
                     <div class="info">
-                        <div class="sku">规格：{{item.productSpec}}</div>
-                        <div class="count">数量：{{item.count}}</div>
+                        <div class="sku">规格：{{ item.productSpec }}</div>
+                        <div class="count">数量：{{ item.count }}</div>
                     </div>
                     <div class="money">
-                        <div class="price">金额：￥{{item.amount / 100}}</div>
-                        <div class="commission">佣金：￥{{item.estimateComission / 100}}</div>
+                        <div class="price">金额：￥{{ item.amount / 100 }}</div>
+                        <div class="commission">
+                            佣金：￥{{ item.estimateComission / 100 }}
+                        </div>
+                    </div>
+                    <div class="status">
+                        <div></div>
+                        <div>{{item.status | orderStatus}}</div>
                     </div>
                 </div>
             </li>
@@ -43,57 +55,51 @@
             <ul>
                 <li>
                     <div class="key">总件数：</div>
-                    <div class="value">x{{data.totalCount}}</div>
+                    <div class="value">x{{ data.totalCount }}</div>
 
                     <div class="key key-r">总金额：</div>
-                    <div class="value">￥{{data.totalAmount / 100}}</div>
+                    <div class="value">￥{{ data.totalAmount / 100 }}</div>
                 </li>
                 <li>
-                    <div class="key">积分抵扣（{{data.points}}分）：</div>
-                    <div class="value">-￥{{data.pointsPrice / 100}}</div>
+                    <div class="key">积分抵扣（{{ data.points }}分）：</div>
+                    <div class="value">-￥{{ data.pointsPrice / 100 }}</div>
                 </li>
                 <li>
                     <div class="key">优惠券：</div>
-                    <div class="value">-￥{{data.couponAmount}}</div>
+                    <div class="value">-￥{{ data.couponAmount }}</div>
                 </li>
                 <li>
                     <div class="key">运费/配送费：</div>
-                    <div class="value">￥{{data.postage}}</div>
+                    <div class="value">￥{{ data.postage }}</div>
                 </li>
                 <li>
                     <div class="key">合计：</div>
-                    <div class="value red">￥{{data.amount / 100}}</div>
+                    <div class="value red">￥{{ data.amount / 100 }}</div>
                 </li>
                 <li>
                     <div class="key">佣金：</div>
                     <div class="value blod">
-                        ￥{{data.commission/100}}（佣金）-￥{{data.pointsPrice / 100}}（积分抵扣）=￥{{data.amount / 100}}
+                        ￥{{ data.commission / 100 }}（佣金）-￥{{
+                            data.pointsPrice / 100
+                        }}（积分抵扣）=￥{{ data.amount / 100 }}
                     </div>
                 </li>
             </ul>
         </section>
         <section class="info-box">
             <ul>
-                <li>
-                    <div class="key">下单时间：</div>
-                    <div class="value">{{data.orderTime | dateFormat("yyyy-MM-dd hh:mm")}}</div>
-                </li>
                 <!-- <li>
-                    <div class="key">支付时间：</div>
-                    <div class="value">2021/01/01 11:00</div>
-                </li>
-                <li>
-                    <div class="key">发货时间：</div>
-                    <div class="value">2021/01/01 11:00</div>
-                </li>
-                <li>
-                    <div class="key">订单完成：</div>
-                    <div class="value">2021/01/01 11:00</div>
-                </li>
-                <li>
-                    <div class="key">退款时间：</div>
-                    <div class="value">2021/01/01 11:00</div>
+                    <div class="key">下单时间：</div>
+                    <div class="value">
+                        {{ data.orderTime | dateFormat("yyyy-MM-dd hh:mm") }}
+                    </div>
                 </li> -->
+                <li v-for="item of data.logs" :key="item.time">
+                    <div class="key">{{ item.title }}：</div>
+                    <div class="value">
+                        {{ item.time | dateFormat("yyyy-MM-dd hh:mm") }}
+                    </div>
+                </li>
             </ul>
         </section>
     </div>
@@ -197,14 +203,14 @@ export default {
         justify-content: space-between;
         margin-top: px(30);
         .img {
-            width: px(200);
-            height: px(200);
+            width: px(230);
+            height: px(230);
             flex-shrink: 0;
             margin-right: px(20);
             background-color: #f9f9f9;
             /deep/ img {
-                width: px(200);
-                height: px(200);
+                width: px(230);
+                height: px(230);
             }
         }
     }
@@ -267,7 +273,8 @@ export default {
                 @include omits(2);
             }
             .info,
-            .money {
+            .money,
+            .status {
                 margin-top: px(10);
                 display: flex;
                 justify-content: space-between;
@@ -277,6 +284,11 @@ export default {
             .sku {
                 color: #666;
             }
+            .status{
+                
+    font-size: px(36);
+    color: #f78819;
+            }
         }
     }
 }
@@ -302,7 +314,7 @@ export default {
         margin-left: px(50);
     }
 }
-.blod{
+.blod {
     font-weight: bold;
 }
 </style>

src/pages/youxuan/order/index.vue

@@ -2,7 +2,10 @@
     <div class="page">
         <div class="filter">
             <span class="key">时间：</span>
-            <picker mode="date" @change="dateChange($event, 'startDate')"
+            <picker
+                mode="date"
+                @change="dateChange($event, 'startDate')"
+                :end="filter.endDate || endDate"
                 ><input
                     class="value"
                     placeholder="开始日期"
@@ -10,7 +13,11 @@
                     v-model="filter.startDate"
             /></picker>
             <span class="row">至</span>
-            <picker mode="date" @change="dateChange($event, 'endDate')"
+            <picker
+                mode="date"
+                @change="dateChange($event, 'endDate')"
+                :start="filter.startDate"
+                :end="endDate"
                 ><input
                     class="value"
                     placeholder="结束日期"
@@ -113,11 +120,12 @@ export default {
             pageIndex: 1,
             dataEnd: false,
             listData: [],
+            endDate: "",
         };
     },
     onLoad() {
-        
         this.getList();
+        this.endDate = this.fn.dateFormat2(new Date());
     },
 
     onShow() {},

src/pages/youxuan/profit.vue

@@ -2,12 +2,17 @@
     <div class="page">
         <div class="profit-info">
             <h6 class="tit">累计优选佣金</h6>
-            <div class="money" v-if="dataInfo">{{dataInfo.totalCommission / 100}}</div>
+            <div class="money" v-if="dataInfo">
+                {{ dataInfo.totalCommission / 100 }}
+            </div>
         </div>
 
         <div class="filter">
             <span class="key">时间：</span>
-            <picker mode="date" @change="dateChange($event, 'startDate')"
+            <picker
+                mode="date"
+                @change="dateChange($event, 'startDate')"
+                :end="filter.endDate || endDate"
                 ><input
                     class="value"
                     placeholder="开始日期"
@@ -15,7 +20,11 @@
                     v-model="filter.startDate"
             /></picker>
             <span class="row">至</span>
-            <picker mode="date" @change="dateChange($event, 'endDate')"
+            <picker
+                mode="date"
+                @change="dateChange($event, 'endDate')"
+                :start="filter.startDate"
+                :end="endDate"
                 ><input
                     class="value"
                     placeholder="结束日期"
@@ -75,7 +84,8 @@ export default {
             pageIndex: 1,
             dataEnd: false,
             listData: [],
-            dataInfo:null,
+            dataInfo: null,
+            endDate: "",
         };
     },
     onShow() {},
@@ -83,6 +93,7 @@ export default {
     onLoad() {
         this.getList();
         this.getInfo();
+        this.endDate = this.fn.dateFormat2(new Date());
     },
     onPullDownRefresh() {
         this.getList(true);
@@ -94,8 +105,7 @@ export default {
 
     // 函数
     methods: {
-
-        getInfo(){
+        getInfo() {
             this.api.get("/Yx/GetProfitInfo").then((res) => {
                 this.dataInfo = res.data;
             });