修改bug

src/common/js/plugin.js

@@ -257,6 +257,24 @@ export default {
                                 uni.hideLoading();
                                 resolve()
                             })
+                        } else if (option.query.shareId) {
+                            api.get('/Share/GetSharePath', {
+                                id: option.query.shareId,
+                            }).then(res => {
+                                let data = JSON.parse(res.data.parameters);
+                                if (data.shopId) {
+
+                                    this.updateShop(data.shopId, () => {
+                                        store.commit('user/init');
+                                        uni.hideLoading();
+                                        resolve()
+                                    })
+                                } else {
+                                    store.commit('user/init');
+                                    uni.hideLoading();
+                                    resolve()
+                                }
+                            })
                         } else {
                             store.commit('user/init');
                             uni.hideLoading();
@@ -288,7 +306,7 @@ export default {
         api.get("/Shop/Detail", { id: shopId })
             .then((res) => {
                 if (!store.state.common.activeUpShop || store.state.common.activeUpShop.id !== store.state.common.activeShop.id) {
-   
+
                     store.commit("common/update", {
                         activeUpShop: store.state.common.activeShop,
                     });

src/pages/goods/detail.vue

@@ -864,6 +864,7 @@ export default {
                                 });
                             }),
                     ]).then((res) => {
+                        console.log(1111);
                         // 背景
                         ctx.setFillStyle("#fff");
                         ctx.fillRect(0, 0, self.getPx(670), self.getPx(1080));

src/pages/order/afterSale.vue

@@ -23,10 +23,10 @@
         </div>
         <div class="button" v-if="info">
             <div v-if="info.rejectCount < 2 && (info.status === 4 || info.status === 6 || info.status === 10)" class="button__btn" @click="jumpApply()">申请退款</div>
-            <div v-if="info.status === 1 || info.status === 5" class="button__btn" @click="jumpApply('update')">修改申请</div>
-            <div v-if="info.status === 1 || info.status === 5" class="button__btn" @click="cancel">取消退款</div>
+            <div v-if="info.status === 1 || info.status === 5 || info.status === 8" class="button__btn" @click="jumpApply('update')">修改申请</div>
+            <div v-if="info.status === 1 || info.status === 5 || info.status === 8" class="button__btn" @click="cancel">取消退款</div>
             <!-- <div  class="button__btn active-btn" @click="jumpLogistics">填写物流信息</div> -->
-            <div v-if="info.status === 8" class="button__btn" @click="jumpLogistics">填写物流信息</div>
+            <div v-if="info.status === 8" class="button__btn active-btn" @click="jumpLogistics">填写退货单号</div>
         </div>
         <ul class="list">
             <li class="list__item" v-if="!info">

src/pages/order/index.vue

@@ -276,7 +276,7 @@ export default {
                 6: "退货取消",
                 7: "退货完成",
                 8: "等待买家退货",
-                9: "等待确认收货",
+                9: "等待商家确认收货",
                 10: "已拒绝",
             },
             loading: false, // 是否加载完成

src/pages/recommend/detail.vue

@@ -861,187 +861,203 @@ export default {
             uni.showLoading({
                 title: "正在生成海报",
             });
-            return new Promise((resolve) => {
-                self.router.getScene(self.$mp.query).then((res) => {
-                    res.uid = self.user.id;
-                    res.shopId = self.activeShop.id;
 
-                    Promise.all([
-                        uni.getImageInfo({
-                            src: self.goods.brandLogo,
-                        }),
-                        uni.getImageInfo({
-                            src: self.goods.pictureUrls[0],
-                        }),
-                        // 获取小程序吗
-                        self.api
-                            .get("/Share/GetQRCode", {
-                                path: self.$mp.page.route,
-                                paremeters: JSON.stringify(res),
-                            })
-                            .then((res) => {
-                                return uni.getImageInfo({
-                                    src: res.data,
-                                });
+            return new Promise((resolve) => {
+                let logoUrl =
+                    "https://youxuan.ixiaokejia.com/home/forwardimg?url=" +
+                    encodeURI(self.goods.pictureUrls[0]);
+                self.api.get(logoUrl).then((logoRes) => {
+                    self.router.getScene(self.$mp.query).then((res) => {
+                        res.uid = self.user.id;
+                        res.shopId = self.activeShop.id;
+
+                        Promise.all([
+                            uni.getImageInfo({
+                                src: self.goods.brandLogo,
                             }),
-                    ]).then((res) => {
-                        // 背景
-                        ctx.setFillStyle("#fff");
-                        ctx.fillRect(0, 0, self.getPx(670), self.getPx(1080));
-
-                        // 头像
-                        if (res[0][1].path) {
-                            let avatarurl_width = self.getPx(70);
-                            let avatarurl_heigth = self.getPx(70);
-                            let avatarurl_x = self.getPx(30);
-                            let avatarurl_y = self.getPx(40);
-                            ctx.save();
-                            ctx.beginPath();
-                            ctx.arc(
-                                avatarurl_width / 2 + avatarurl_x,
-                                avatarurl_heigth / 2 + avatarurl_y,
-                                avatarurl_width / 2,
+                            uni.getImageInfo({
+                                src: logoRes.data,
+                            }),
+                            // 获取小程序吗
+                            self.api
+                                .get("/Share/GetQRCode", {
+                                    path: self.$mp.page.route,
+                                    paremeters: JSON.stringify(res),
+                                })
+                                .then((res) => {
+                                    return uni.getImageInfo({
+                                        src: res.data,
+                                    });
+                                }),
+                        ]).then((res) => {
+                            // 背景
+                            ctx.setFillStyle("#fff");
+                            ctx.fillRect(
                                 0,
-                                Math.PI * 2,
-                                true
-                            );
-                            ctx.clip();
-                            ctx.drawImage(
-                                res[0][1].path,
-                                avatarurl_x,
-                                avatarurl_y,
-                                avatarurl_width,
-                                avatarurl_heigth
+                                0,
+                                self.getPx(670),
+                                self.getPx(1080)
                             );
-                            ctx.restore();
-                        }
 
-                        // 昵称
-                        ctx.setFontSize(self.getPx(28));
-                        ctx.setFillStyle("#333");
-                        ctx.fillText(
-                            self.goods.brandName,
-                            self.getPx(115),
-                            self.getPx(90)
-                        );
-                        ctx.stroke();
+                            // 头像
+                            if (res[0][1].path) {
+                                let avatarurl_width = self.getPx(70);
+                                let avatarurl_heigth = self.getPx(70);
+                                let avatarurl_x = self.getPx(30);
+                                let avatarurl_y = self.getPx(40);
+                                ctx.save();
+                                ctx.beginPath();
+                                ctx.arc(
+                                    avatarurl_width / 2 + avatarurl_x,
+                                    avatarurl_heigth / 2 + avatarurl_y,
+                                    avatarurl_width / 2,
+                                    0,
+                                    Math.PI * 2,
+                                    true
+                                );
+                                ctx.clip();
+                                ctx.drawImage(
+                                    res[0][1].path,
+                                    avatarurl_x,
+                                    avatarurl_y,
+                                    avatarurl_width,
+                                    avatarurl_heigth
+                                );
+                                ctx.restore();
+                            }
 
-                        // // 商品图片
-                        ctx.drawImage(
-                            res[1][1].path,
-                            self.getPx(0),
-                            self.getPx(145),
-                            self.getPx(670),
-                            self.getPx(670)
-                        );
-
-                        // 商品标题，第一行
-                        let goodsName = self.goods.name;
-
-                        if (goodsName.length > 12) {
-                            goodsName = goodsName.substr(0, 12);
-                        }
-                        ctx.setFontSize(self.getPx(28));
-                        ctx.setFillStyle("#333");
-                        ctx.fillText(
-                            goodsName,
-                            self.getPx(50),
-                            self.getPx(880)
-                        );
-                        ctx.stroke();
+                            // 昵称
+                            ctx.setFontSize(self.getPx(28));
+                            ctx.setFillStyle("#333");
+                            ctx.fillText(
+                                self.goods.brandName,
+                                self.getPx(115),
+                                self.getPx(90)
+                            );
+                            ctx.stroke();
+
+                            // // 商品图片
+                            ctx.drawImage(
+                                res[1][1].path,
+                                self.getPx(0),
+                                self.getPx(145),
+                                self.getPx(670),
+                                self.getPx(670)
+                            );
 
-                        // 商品标题，第二行
-                        let goodsName2 = self.goods.name;
-                        if (goodsName2.length > 12) {
-                            goodsName2 = goodsName2.substr(12, 10) + "...";
+                            // 商品标题，第一行
+                            let goodsName = self.goods.name;
 
+                            if (goodsName.length > 12) {
+                                goodsName = goodsName.substr(0, 12);
+                            }
                             ctx.setFontSize(self.getPx(28));
                             ctx.setFillStyle("#333");
                             ctx.fillText(
-                                goodsName2,
+                                goodsName,
                                 self.getPx(50),
-                                self.getPx(920)
+                                self.getPx(880)
                             );
                             ctx.stroke();
-                        }
-
-                        // 商品描述，第一行
-                        let descName = self.goods.description;
 
-                        if (descName.length > 14) {
-                            descName = descName.substr(0, 14);
-                        }
-                        ctx.setFontSize(self.getPx(24));
-                        ctx.setFillStyle("#666");
-                        ctx.fillText(descName, self.getPx(50), self.getPx(965));
-                        ctx.stroke();
+                            // 商品标题，第二行
+                            let goodsName2 = self.goods.name;
+                            if (goodsName2.length > 12) {
+                                goodsName2 = goodsName2.substr(12, 10) + "...";
+
+                                ctx.setFontSize(self.getPx(28));
+                                ctx.setFillStyle("#333");
+                                ctx.fillText(
+                                    goodsName2,
+                                    self.getPx(50),
+                                    self.getPx(920)
+                                );
+                                ctx.stroke();
+                            }
 
-                        // 商品描述，第二行
-                        let descName2 = self.goods.description;
-                        if (descName2.length > 14) {
-                            descName2 = descName2.substr(14, 14) + "...";
+                            // 商品描述，第一行
+                            let descName = self.goods.description;
 
+                            if (descName.length > 14) {
+                                descName = descName.substr(0, 14);
+                            }
                             ctx.setFontSize(self.getPx(24));
                             ctx.setFillStyle("#666");
                             ctx.fillText(
-                                descName2,
+                                descName,
                                 self.getPx(50),
-                                self.getPx(995)
+                                self.getPx(965)
                             );
                             ctx.stroke();
-                        }
 
-                        // 商品价格符号
-                        ctx.setFontSize(self.getPx(20));
-                        ctx.setFillStyle("#f8662a");
-                        ctx.fillText("¥", self.getPx(50), self.getPx(1050));
-                        ctx.stroke();
+                            // 商品描述，第二行
+                            let descName2 = self.goods.description;
+                            if (descName2.length > 14) {
+                                descName2 = descName2.substr(14, 14) + "...";
+
+                                ctx.setFontSize(self.getPx(24));
+                                ctx.setFillStyle("#666");
+                                ctx.fillText(
+                                    descName2,
+                                    self.getPx(50),
+                                    self.getPx(995)
+                                );
+                                ctx.stroke();
+                            }
 
-                        // 商品价格
-                        ctx.setFontSize(self.getPx(40));
-                        ctx.setFillStyle("#f8662a");
-                        ctx.fillText(
-                            self.goods.minPrice / 100,
-                            self.getPx(65),
-                            self.getPx(1050)
-                        );
-                        ctx.stroke();
+                            // 商品价格符号
+                            ctx.setFontSize(self.getPx(20));
+                            ctx.setFillStyle("#f8662a");
+                            ctx.fillText("¥", self.getPx(50), self.getPx(1050));
+                            ctx.stroke();
 
-                        // 小程序吗
-                        ctx.drawImage(
-                            res[2][1].path,
-                            self.getPx(460),
-                            self.getPx(850),
-                            self.getPx(170),
-                            self.getPx(170)
-                        );
-
-                        // 长按扫码购买
-                        ctx.setFontSize(self.getPx(24));
-                        ctx.setFillStyle("#999");
-                        ctx.fillText(
-                            "长按扫码购买",
-                            self.getPx(470),
-                            self.getPx(1050)
-                        );
-                        ctx.stroke();
+                            // 商品价格
+                            ctx.setFontSize(self.getPx(40));
+                            ctx.setFillStyle("#f8662a");
+                            ctx.fillText(
+                                self.goods.minPrice / 100,
+                                self.getPx(65),
+                                self.getPx(1050)
+                            );
+                            ctx.stroke();
 
-                        ctx.draw();
+                            // 小程序吗
+                            ctx.drawImage(
+                                res[2][1].path,
+                                self.getPx(460),
+                                self.getPx(850),
+                                self.getPx(170),
+                                self.getPx(170)
+                            );
 
-                        self.canvasShow = true;
-                        uni.hideLoading();
-                        setTimeout(() => {
-                            // 生成临时路径
-                            uni.canvasToTempFilePath({
-                                canvasId: "canvas",
-                                fileType: "jpg",
-                                success: function (res) {
-                                    // self.canvasShow = false
-                                    self.canvasImgPath = [res.tempFilePath];
-                                    resolve(res.tempFilePath);
-                                },
-                            });
-                        }, 100);
+                            // 长按扫码购买
+                            ctx.setFontSize(self.getPx(24));
+                            ctx.setFillStyle("#999");
+                            ctx.fillText(
+                                "长按扫码购买",
+                                self.getPx(470),
+                                self.getPx(1050)
+                            );
+                            ctx.stroke();
+
+                            ctx.draw();
+
+                            self.canvasShow = true;
+                            uni.hideLoading();
+                            setTimeout(() => {
+                                // 生成临时路径
+                                uni.canvasToTempFilePath({
+                                    canvasId: "canvas",
+                                    fileType: "jpg",
+                                    success: function (res) {
+                                        // self.canvasShow = false
+                                        console.log(res.tempFilePath,2222);
+                                        self.canvasImgPath = [res.tempFilePath];
+                                        resolve(res.tempFilePath);
+                                    },
+                                });
+                            }, 100);
+                        });
                     });
                 });
             });
@@ -1875,7 +1891,6 @@ page {
         width: px(920);
         height: px(1483);
         background-color: #fff;
-        display: none;
     }
 }
 .canvas__forward {

src/pages/user/index.vue

@@ -279,7 +279,7 @@
         </div>
 
         <div class="web-support">
-            <p class="text">0.0.95</p>
+            <p class="text">0.0.96</p>
             <!-- <div class="num" @click="makeCall">400-629-6782</div> -->
         </div>
     </div>