修改bug

src/common/store/common.js

@@ -22,6 +22,7 @@ const module = {
         billData:null,//wallet/detail/ 临时保存
         welcomeData:null, // assistant/welcome-item 临时保存
         welcomeItemData:null,// assistant/welcome-item 临时保存
+        activityData:null,// youxuan/good 临时保存
         tabList:[{
             id: 1,
             name: "订单",

src/pages/assistant/add-platform.vue

@@ -140,6 +140,7 @@ export default {
         },
 
         commitPid(sendData) {
+            let self = this;
             let pName = "";
             for (let item of this.list) {
                 if (item.platform === this.activeValue) {
@@ -150,20 +151,21 @@ export default {
                 .get("/Group/AddJDPlatform", sendData, { pass: true })
                 .then((res) => {
                     if (res.success) {
-                        this.fn.showModal({
-                            title: "添加平台成功",
-                            content: `你已成功添加${''},如果需要在群内关联平台，请在群详情下关联平台，获取点击“一键关联群”，现在一键关联`,
-                            confirmText: "一键关联",
-                            cancelText: "稍后关联",
-                            confirmColor: "#42b983",
-                            success: (res2) => {
+                        this.fn
+                            .showModal({
+                                title: "添加平台成功",
+                                content: `您已成功添加${pName}，点击“一键关联”将您的群和平台关联”，现在一键关联`,
+                                confirmText: "一键关联",
+                                confirmColor: "#42b983",
+                                showCancel: false,
+                            })
+                            .then((res2) => {
                                 if (res2.confirm) {
-                                    this.enableShopJDPlatform();
+                                    self.enableShopJDPlatform();
                                 } else {
-                                    this.router.back();
+                                    self.router.back();
                                 }
-                            },
-                        });
+                            });
                     } else {
                         this.fn.showModal({
                             title: "团长号提交失败",
@@ -175,9 +177,13 @@ export default {
         },
 
         enableShopJDPlatform() {
+            uni.showLoading({
+                title: "提交中",
+            });
             this.api
                 .get("/Group/enableShopJDPlatform", {}, { pass: true })
                 .then((res) => {
+                    uni.hideLoading();
                     if (res.success) {
                         this.fn.showToast("一键关联成功");
                         this.router.back();

src/pages/assistant/index.vue

@@ -111,8 +111,12 @@ export default {
     onLoad() {},
     async onShow() {
         this.$refs.tabbar.setIndex(3);
-        this.getList();
         this.checkStatus();
+        if (this.tabIndex === 0) {
+            this.getList();
+        } else {
+            this.getPlatformList();
+        }
     },
 
     // onPullDownRefresh() {

src/pages/assistant/re-pid.vue

@@ -8,7 +8,11 @@
                 </div>
                 <div class="box">
                     <div class="con">
-                        <input type="text" v-model="pid" placeholder="90000*****" />
+                        <input
+                            type="text"
+                            v-model="pid"
+                            placeholder="90000*****"
+                        />
                     </div>
                 </div>
             </section>
@@ -27,15 +31,14 @@ export default {
     data() {
         return {
             submitLoading: false,
-            pid:'',
+            pid: "",
             platformData: {},
         };
     },
 
     onLoad() {
         this.platformData = this.$store.state.common.platformData;
-        this.pid = this.platformData.pid || '';
-        // console.log(this.platformData);
+        this.pid = this.platformData.pid || "";
     },
 
     onShow() {},
@@ -67,13 +70,17 @@ export default {
                     uni.hideLoading();
                     if (res.success) {
                         this.fn.showToast("修改成功");
+                        let obj = { ...this.platformData };
+                        obj.pid = this.pid;
+                        this.$store.commit("common/update", {
+                            platformData: obj,
+                        });
+                        console.log(obj)
                         this.router.back();
                     } else {
                         this.fn.showModal({
                             title: "修改失败",
-                            content:
-                                "错误信息:" +
-                                res.message,
+                            content: "错误信息:" + res.message,
                             showCancel: false,
                         });
                     }

src/pages/manage/index.vue

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

src/pages/youxuan/brand.vue

@@ -80,9 +80,18 @@
                                                     }}
                                                 </div>
                                                 <div class="goods__sale flex">
-                                                    <span> {{ item.onlineProductCount }}款 </span>
-
-                                                    <span> 最多赚：{{item.maxCommission / 100}} </span>
+                                                    <span>
+                                                        {{
+                                                            item.onlineProductCount
+                                                        }}款
+                                                    </span>
+
+                                                    <span>
+                                                        最多赚：{{
+                                                            item.maxCommission /
+                                                            100
+                                                        }}
+                                                    </span>
                                                 </div>
                                             </div>
                                             <!-- <div
@@ -183,6 +192,7 @@ export default {
             activityPageIndex: 1,
             activityList: [],
             isMoreEnd: false,
+            otherUrl: "https://bot.ixiaokejia.com/",
         };
     },
     filters: {
@@ -205,10 +215,7 @@ export default {
             let quarter = month * 3;
             let year = quarter * 12;
             if (mius < 0) {
-                return `结束时间：${plugin.dateFormat(
-                    dateStr,
-                    "MM-dd hh:mm"
-                )}`;
+                return `结束时间：${plugin.dateFormat(dateStr, "MM-dd hh:mm")}`;
             } else if (mius < minute) {
                 return `距结束还有${Math.floor(mius / 1000)}秒`;
             } else if (mius < hour) {
@@ -218,10 +225,7 @@ export default {
             } else if (mius < month) {
                 return `距结束还有${Math.floor(mius / day)}天`;
             } else if (mius < quarter) {
-                return `结束时间：${plugin.dateFormat(
-                    dateStr,
-                    "MM-dd hh:mm"
-                )}`;
+                return `结束时间：${plugin.dateFormat(dateStr, "MM-dd hh:mm")}`;
             }
         },
     },
@@ -393,7 +397,32 @@ export default {
         },
 
         // 推送
-        pushGive(val) {},
+        pushGive(item,type) {
+            let sendData = {
+                pid: item.aid,
+                aid: item.aid,
+                // 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, {
+                    pass: true,
+                })
+                .then((res) => {
+                    this.fn.showToast(res.message);
+                });
+        },
+
 
         // 分享
         shareApp(val) {
@@ -421,13 +450,16 @@ export default {
         },
 
         // 去详情
-        goDetail(val){
+        goDetail(val) {
+            this.$store.commit("common/update", {
+                activityData: val,
+            });
             this.router.push({
-                path:'/pages/youxuan/good',
-                query:{
-                    aid:val.aid
-                }
-            })
+                path: "/pages/youxuan/good",
+                query: {
+                    aid: val.aid,
+                },
+            });
         },
     },
 

src/pages/youxuan/good.vue

@@ -37,7 +37,11 @@
                                             {{ activity.brandName }}
                                         </div>
                                         <div class="tags">
-                                            <span>263款</span>
+                                            <span
+                                                >{{
+                                                    item.onlineProductCount
+                                                }}款</span
+                                            >
                                             <span>正品保障</span>
                                             <span>包邮</span>
                                         </div>
@@ -46,7 +50,9 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="des">发货：xxxxx</div>
+                                <div class="des">
+                                    发货：{{ activity.deliveryDesc }}
+                                </div>
                                 <div class="des">
                                     服务：退换无忧，支持7天无理由退换
                                 </div>
@@ -73,56 +79,90 @@
                                     >
                                 </div>
                             </div>
+                            <ul class="menu">
+                                <li
+                                    class="menu__item"
+                                    :class="{
+                                        'menu__item--active': sort === 0,
+                                    }"
+                                    @click="setSort(0)"
+                                >
+                                    <div class="menu__text">综合</div>
+                                    <div
+                                        class="menu__sort"
+                                        :class="{
+                                            'menu__sort--up': sort === 0,
+                                            'menu__sort--down': sort === -100,
+                                        }"
+                                    ></div>
+                                </li>
+                                <li
+                                    class="menu__item"
+                                    :class="{
+                                        'menu__item--active': sort === 2,
+                                    }"
+                                    @click="setSort(2)"
+                                >
+                                    <div class="menu__text">销量</div>
+                                    <div
+                                        class="menu__sort"
+                                        :class="{
+                                            'menu__sort--up': sort === 2,
+                                            'menu__sort--down': sort === -2,
+                                        }"
+                                    ></div>
+                                </li>
+                                <li
+                                    class="menu__item"
+                                    :class="{
+                                        'menu__item--active': sort === 1,
+                                    }"
+                                    @click="setSort(1)"
+                                >
+                                    <div class="menu__text">价格</div>
+                                    <div
+                                        class="menu__sort"
+                                        :class="{
+                                            'menu__sort--up': sort === 1,
+                                            'menu__sort--down': sort === -1,
+                                        }"
+                                    ></div>
+                                </li>
+                            </ul>
                             <ul class="goods__list">
                                 <li
                                     class="goods__item"
-                                    v-for="(item, index) in goodsList"
+                                    v-for="(item, index) in goodList"
                                     :key="index"
                                 >
-                                    <div class="main">
+                                    <div class="main" @click="goDetail(item)">
                                         <my-image
                                             class="goods__img"
-                                            :src="item.mainImage"
-                                            @click="edit(item)"
+                                            :src="item.pictureUrls[0]"
                                         ></my-image>
                                         <div class="goods__info">
                                             <div class="goods__box">
-                                                <div
-                                                    class="goods__title"
-                                                    @click="edit(item)"
-                                                >
+                                                <div class="goods__title">
                                                     {{ item.name }}
                                                 </div>
-                                                <div
-                                                    class="goods__sale"
-                                                    @click="edit(item)"
-                                                >
-                                                    <span v-if="item.price">
+                                                <div class="goods__sale">
+                                                    <span v-if="item.agentFee">
                                                         价格：￥{{
-                                                            item.price / 100
+                                                            item.agentFee / 100
                                                         }}
                                                     </span>
 
-                                                    <span v-if="item.stock">
-                                                        库存：{{ item.stock }}
+                                                    <span
+                                                        v-if="
+                                                            item.totalInventory
+                                                        "
+                                                    >
+                                                        库存：{{
+                                                            item.totalInventory
+                                                        }}
                                                     </span>
                                                 </div>
                                             </div>
-                                            <!-- <div
-                                            class="goods__price"
-                                            @click="edit(item)"
-                                        >
-                                            <div class="goods__present">
-                                                价格：{{ "¥" + item.price / 100 }}
-                                            </div>
-                                            <div
-                                                class="goods__original"
-                                                v-if="item.stock !== 0"
-                                            >
-                                                库存：{{ "¥" + item.stock }}
-                                            </div>
-                                        </div> -->
-                                            <!-- 登录 -->
                                         </div>
                                     </div>
 
@@ -132,15 +172,13 @@
                                         </div>
                                         <div
                                             class="btn"
-                                            @click="sendProduct(item, 'text')"
+                                            @click="pushProduct(item)"
                                         >
                                             推荐
                                         </div>
                                         <div
                                             class="btn"
-                                            @click="
-                                                sendProduct(item, 'product')
-                                            "
+                                            @click="shareGood(item)"
                                         >
                                             分享
                                         </div>
@@ -188,9 +226,15 @@ export default {
     // 数据
     data() {
         return {
-
             aid: "",
             activity: {},
+            goodList: [],
+            goodPageIndex: 1,
+            sort: 0,
+            dataEnd: false,
+            shopId: "",
+            searchVal: "",
+            otherUrl: "https://bot.ixiaokejia.com/",
         };
     },
     filters: {
@@ -236,28 +280,304 @@ export default {
 
     onLoad(opts) {
         this.aid = opts.id;
-    },
 
-    async onShow() {
-        this.getActivity();
+        this.activity = this.$store.state.common.activityData;
+        // console.log(this.activity)
+        this.getGoods();
+        this.getShopInfo();
     },
 
-    onPullDownRefresh() {
-    },
+    async onShow() {},
+
+    onPullDownRefresh() {},
 
     // 函数
     methods: {
-        getActivity() {
+        // 获取店铺信息
+        getShopInfo() {
+            this.api
+                .get("/Shop/GetInfo", {}, { pass: true })
+                .then((infoRes) => {
+                    this.shopId = infoRes.data.id;
+                });
+        },
+        // 设置排序
+        setSort(val) {
+            const self = this;
+
+            if (val === this.sort) {
+                if (val === 0) {
+                    this.sort = -100;
+                } else if (val === -100) {
+                    this.sort = 0;
+                } else {
+                    this.sort = -this.sort;
+                }
+            } else {
+                this.sort = val;
+            }
+
+            this.getGoods();
+        },
+        getGoods() {
+            this.goodPageIndex = 1;
+            this.dataEnd = false;
+            let sendData = {
+                activityNo: this.activity.activityNo,
+                // keyword:'',
+                // asc:'',升降序，0-倒序，1-正序
+                // sortBy:''
+                pageIndex: this.goodPageIndex++,
+            };
+            if (this.searchVal) {
+                sendData.keyword = this.searchVal;
+            }
+            sendData = this.pushSort(sendData);
+
+            this.api.get("/Yx/GetProductList", sendData).then((res) => {
+                this.goodList = res.data;
+                if (!res.data.length) {
+                    this.dataEnd = true;
+                }
+            });
+        },
+        getMoreGoods() {
+            if (this.dataEnd) {
+                return;
+            }
+            let sendData = {
+                activityNo: this.activity.activityNo,
+                // keyword:'',
+                // asc:'',升降序，0-倒序，1-正序
+                // sortBy:''
+                pageIndex: this.goodPageIndex++,
+            };
+            if (this.searchVal) {
+                sendData.keyword = this.searchVal;
+            }
+            sendData = this.pushSort(sendData);
+
+            this.api.get("/Yx/GetProductList", sendData).then((res) => {
+                this.goodList = [...this.goodList, ...res.data];
+                if (!res.data.length) {
+                    this.dataEnd = true;
+                }
+            });
+        },
+        // 搜索
+        search() {
+            if (this.searchVal) {
+                this.getGoods();
+            }
+        },
+
+        closeSearchVal() {
+            this.searchVal = "";
+            this.getGoods();
+        },
+
+        pushSort(sendData) {
+            switch (this.sort) {
+                case 0:
+                    sendData.sortBy = 0;
+                    sendData.asc = 1;
+                    break;
+                case -100:
+                    sendData.sortBy = 0;
+                    sendData.asc = 0;
+                    break;
+                case 1:
+                    sendData.sortBy = 1;
+                    sendData.asc = 1;
+                    break;
+                case -1:
+                    sendData.sortBy = 1;
+                    sendData.asc = 0;
+                    break;
+                case 2:
+                    sendData.sortBy = 2;
+                    sendData.asc = 1;
+                    break;
+                case -2:
+                    sendData.sortBy = 2;
+                    sendData.asc = 0;
+                    break;
+            }
+            return sendData;
+        },
+
+        //  设置活动置顶
+        setActivityTop(val) {
+            if (val.top > 0) {
+                // 取消置顶
+                this.api
+                    .get("/Yx/CancelActivityTop", {
+                        aid: val.aid,
+                    })
+                    .then((res) => {
+                        if (res.success) {
+                            val.top = 0;
+                            this.$forceUpdate();
+                            this.fn.showToast("取消成功");
+                        } else {
+                            this.fn.showModal({
+                                title: "设置失败",
+                                content: res.message,
+                                showCancel: false,
+                            });
+                        }
+                    });
+            } else {
+                // 置顶
+                this.api
+                    .get("/Yx/SetActivityTop", {
+                        aid: val.aid,
+                    })
+                    .then((res) => {
+                        if (res.success) {
+                            val.top = 1;
+                            this.$forceUpdate();
+                            this.fn.showToast("置顶成功");
+                        } else {
+                            this.fn.showModal({
+                                title: "设置失败",
+                                content: res.message,
+                                showCancel: false,
+                            });
+                        }
+                    });
+            }
+        },
+
+        // 设置活动显示或隐藏
+        setActivityDisplay(val) {
+            let display = 0;
+            if (val.display === 1) {
+                // 隐藏
+                display = 0;
+            } else {
+                // 置顶
+                display = 1;
+            }
+            this.api
+                .get("/Yx/SetActivityDisplay", {
+                    aid: val.aid,
+                    display,
+                })
+                .then((res) => {
+                    if (res.success) {
+                        val.display = display;
+                        this.$forceUpdate();
+                        this.fn.showToast("设置成功");
+                    } else {
+                        this.fn.showModal({
+                            title: "设置失败",
+                            content: res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
+        },
+
+        // 推送
+        pushGive(item,type) {
+            let sendData = {
+                pid: item.aid,
+                aid: item.aid,
+                // 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, {
+                    pass: true,
+                })
+                .then((res) => {
+                    this.fn.showToast(res.message);
+                });
+        },
+
+        // 分享
+        shareApp(val) {
+            uni.navigateToMiniProgram({
+                appId: "wx7d16ba51271496b8",
+                path: `/pages/recommend/list?shopId=${this.shopId}&aid=${val.aid}`,
+                extraData: {
+                    shopId: this.shopId,
+                    aid: val.aid,
+                },
+            });
+        },
+
+        // 推荐商品
+        pushProduct(item,type) {
             let sendData = {
-                cateId: 1,
-                pageIndex: 1,
+                pid: item.id,
+                // storeId: item.storeId,
+                platform:1000
             };
-            this.api.get("/Yx/GetActivityList", sendData).then((res) => {
-                this.activity = res.data[0];
+            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, {
+                    pass: true,
+                })
+                .then((res) => {
+                    this.fn.showToast(res.message);
+                });
+        },
+
+        // 分享商品
+        shareGood(val) {
+            uni.navigateToMiniProgram({
+                appId: "wx7d16ba51271496b8",
+                path: `/pages/recommend/detail?shopId=${this.shopId}&goodsId=${val.id}`,
+                extraData: {
+                    shopId: this.shopId,
+                    id: val.id,
+                },
             });
         },
 
+        // 更多
+        openMore(val) {
+            let arr = [];
+            if (val.top === 0) {
+                arr.push("置顶");
+            } else {
+                arr.push("取消置顶");
+            }
+            this.fn.showActionSheet(arr).then((res) => {
+                switch (arr[res]) {
+                    case "置顶":
+                        // this.edit(val);
+                        breathisk;
+                    case "取消置顶":
+                        // .remove(val, false);
+                        break;
+                }
+            });
+        },
 
+        // 去详情
+        goDetail(val) {},
     },
 
     // 数据计算
@@ -582,9 +902,9 @@ page {
         width: 100%;
         @include omits(2);
         max-height: px(88);
-        line-height: px(44);
+        line-height: px(48);
         margin-top: px(30);
-        font-size: px(36);
+        font-size: px(40);
         color: #333;
     }
 
@@ -592,10 +912,10 @@ page {
         // margin-top: px(30);
     }
     &__sale {
-        font-size: px(32);
+        font-size: px(38);
         line-height: px(40);
         color: #999;
-        margin-top: px(20);
+        margin-top: px(30);
         span ~ span {
             margin-left: px(20);
         }