修改bug

src/common/js/function.js

@@ -368,4 +368,40 @@ export default {
         }
         return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
     },
+
+
+    /**
+     * 转化为指定格式日期
+     * @param date
+     * @param format
+     * @returns {string}
+     */
+    dateFormat(date, format = 'yyyy-MM-dd') {
+        if (date) {
+            date = date.replace(/-/g, '/')
+            date = new Date(Date.parse(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))
+            }
+            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 ''
+        }
+    }
 }

src/pages/manage/index.vue

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

src/pages/youxuan/good.vue

@@ -50,6 +50,20 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div
+                                    class="info__tag"
+                                    v-if="
+                                        activity.activityLabelBOList &&
+                                        activity.activityLabelBOList.length
+                                    "
+                                >
+                                    <span
+                                        class="tag-item"
+                                        v-for="item of activity.activityLabelBOList"
+                                        :key="item.prices"
+                                        >{{ item.prices }}</span
+                                    >
+                                </div>
                                 <div class="des" v-if="activity.description">
                                     <span class="key">说明：</span>
                                     <span
@@ -128,7 +142,8 @@
                                 <li
                                     class="menu__item"
                                     :class="{
-                                        'menu__item--active': sort === 0,
+                                        'menu__item--active':
+                                            sort === 0 || sort === -100,
                                     }"
                                     @click="setSort(0)"
                                 >
@@ -144,7 +159,8 @@
                                 <li
                                     class="menu__item"
                                     :class="{
-                                        'menu__item--active': sort === 2,
+                                        'menu__item--active':
+                                            sort === 2 || sort === -2,
                                     }"
                                     @click="setSort(2)"
                                 >
@@ -160,7 +176,8 @@
                                 <li
                                     class="menu__item"
                                     :class="{
-                                        'menu__item--active': sort === 1,
+                                        'menu__item--active':
+                                            sort === 1 || sort === -1,
                                     }"
                                     @click="setSort(1)"
                                 >
@@ -173,6 +190,23 @@
                                         }"
                                     ></div>
                                 </li>
+                                <li
+                                    class="menu__item"
+                                    :class="{
+                                        'menu__item--active':
+                                            sort === 4 || sort === -4,
+                                    }"
+                                    @click="setSort(4)"
+                                >
+                                    <div class="menu__text">佣金</div>
+                                    <div
+                                        class="menu__sort"
+                                        :class="{
+                                            'menu__sort--up': sort === 4,
+                                            'menu__sort--down': sort === -4,
+                                        }"
+                                    ></div>
+                                </li>
                             </ul>
                             <ul class="goods__list">
                                 <li
@@ -197,14 +231,20 @@
                                                         }}
                                                     </span>
 
-                                                    <span v-if="item.tagPrice" class="text-line">
+                                                    <span
+                                                        v-if="item.tagPrice"
+                                                        class="text-line"
+                                                    >
                                                         原价：￥{{
                                                             item.tagPrice / 100
                                                         }}
                                                     </span>
                                                 </div>
                                                 <div class="goods__sale">
-                                                    <span v-if="item.agentFee" class="red">
+                                                    <span
+                                                        v-if="item.agentFee"
+                                                        class="red"
+                                                    >
                                                         赚：￥{{
                                                             item.agentFee / 100
                                                         }}
@@ -322,6 +362,7 @@
 
 <script>
 import MyImage from "../../components/image/index";
+import fn from "../../common/js/function";
 export default {
     name: "",
     components: { MyImage },
@@ -370,10 +411,7 @@ export default {
             let quarter = month * 3;
             let year = quarter * 12;
             if (mius < 0) {
-                return `结束时间：${this.fn.dateFormat(
-                    dateStr,
-                    "MM-dd hh:mm"
-                )}`;
+                return `结束时间：${fn.dateFormat(dateStr, "MM-dd hh:mm")}`;
             } else if (mius < minute) {
                 return `距结束还有${Math.floor(mius / 1000)}秒`;
             } else if (mius < hour) {
@@ -383,10 +421,7 @@ export default {
             } else if (mius < month) {
                 return `距结束还有${Math.floor(mius / day)}天`;
             } else if (mius < quarter) {
-                return `结束时间：${this.fn.dateFormat(
-                    dateStr,
-                    "MM-dd hh:mm"
-                )}`;
+                return `结束时间：${fn.dateFormat(dateStr, "MM-dd hh:mm")}`;
             }
         },
     },
@@ -520,6 +555,14 @@ export default {
                     sendData.sortBy = 2;
                     sendData.asc = 0;
                     break;
+                case 4:
+                    sendData.sortBy = 4;
+                    sendData.asc = 1;
+                    break;
+                case -4:
+                    sendData.sortBy = 4;
+                    sendData.asc = 0;
+                    break;
             }
             return sendData;
         },
@@ -604,9 +647,18 @@ export default {
         },
 
         // 推送
-        pushGive(item, type) {
-            this.fn.showToast("暂无法使用");
-            //
+        pushGive(item) {
+            let sendData = {
+                pid: item.aid,
+            };
+
+            this.api
+                .get("Yx/SendActivity", sendData, {
+                    pass: true,
+                })
+                .then((res) => {
+                    this.fn.showToast(res.message);
+                });
         },
 
         // 分享
@@ -625,21 +677,10 @@ export default {
         pushProduct(item, type) {
             let sendData = {
                 pid: item.id,
-                // storeId: item.storeId,
-                platform: 1000,
             };
-            if (type === "text") {
-                sendData.sendTxt = false;
-                sendData.sendVideo = false;
-                sendData.sendImg = 0;
-            } else {
-                // sendData.sendTxt = true;
-                // sendData.sendVideo = true;
-                // sendData.sendImg = 3;
-            }
 
             this.api
-                .get(this.otherUrl + "Home/sendproduct", sendData, {
+                .get("/Yx/Sendproduct", sendData, {
                     pass: true,
                 })
                 .then((res) => {
@@ -2031,13 +2072,31 @@ page {
         text-indent: 2em;
     }
 }
-.text-line{
+.text-line {
     text-decoration: line-through;
 }
-.blod{
+.blod {
     font-weight: bold;
 }
-.red{
+.red {
     color: #ff4b26;
 }
+.info__tag {
+    margin-top: px(40);
+    .tag-item {
+        font-size: px(36);
+        margin: 0 px(16) px(16) 0;
+        padding: 0 px(7);
+        display: inline-block;
+        line-height: px(56);
+        border: 1px solid #d9d9d9;
+        border-radius: px(4);
+        opacity: 1;
+        transition: all 0.3s;
+        white-space: nowrap;
+        color: #fa8c16;
+        background: #fff7e6;
+        border-color: #ffd591;
+    }
+}
 </style>