修改bug

src/common/js/plugin.js

@@ -148,6 +148,7 @@ export default {
                             })
 
                             // self.orderTake(orderId, 2)
+                            self.getMsgTpls(orderId, 2);
                             api.post('/Order/Query', {
                                 orderId: orderId,
                             }, { pass: true })
@@ -171,6 +172,7 @@ export default {
 
                             if (jump) {
                                 // self.orderTake(orderId, 1)
+                                self.getMsgTpls(orderId, 1);
                                 router.replace({
                                     path: '/pages/pay/result',
                                     query: {
@@ -213,26 +215,27 @@ export default {
     },
 
     // 订阅订阅消息类型，1-订单未支付，2-订单支付成功，3-直播订阅，4-售后退货/退款订阅消息，5-售后退款订阅消息，6-优惠券订阅消息
-    getMsgTpls(objId, type,callback) {
+    getMsgTpls(objId, type, callback) {
         api.get('/Subscription/GetMsgTpls', {
             type: type,
-        }).then(res => {
+        }, { pass: true }).then(res => {
             uni.requestSubscribeMessage({
                 tmplIds: res.data,
-                success: () => {
+                success: (subRes) => {
+                    console.log('requestSubscribeMessage',subRes)
                     api.post('/Subscription/Subscribe', {
                         type: type,
                         objectId: objId.toString(),
-                    }).then(() => {
+                    }, { pass: true }).then(() => {
                         console.log('订阅成功')
-                        if(callback){
+                        if (callback) {
                             callback();
                         }
                     })
                 },
                 fail: err => {
                     console.log(err)
-                    if(callback){
+                    if (callback) {
                         callback();
                     }
                 },

src/pages/index/index.vue

@@ -86,7 +86,7 @@
                                 <div class="integral">
                                     剩余积分
                                     <span class="num">{{
-                                        item.points | maxNumInt(999)
+                                        item.points | maxNumInt(999999)
                                     }}</span>
                                 </div>
                             </div>

src/pages/order/afterSaleApply.vue

@@ -340,33 +340,40 @@ export default {
             } else if (self.refundPriceText) {
                 self.fn.showToast("退款金额不正确");
             } else {
-                if(this.refundType==='1' && this.orderStatus!='20'){
+                if (this.refundType === "1" && this.orderStatus != "20") {
                     return self.fn.showToast("退货必须上传图片");
                 }
 
+                let type = self.refundType === "1" ? 4 : 5;
                 if (self.applyId && self.type === "update") {
                     // 修改申请
-                    self.api
-                        .post("/AfterSale/UpdateApply", {
-                            id: Number(self.applyId),
-                            orderId: self.orderId,
-                            orderItemId: self.orderItemId,
-                            type: self.refundType === "1" ? 1 : 0,
-                            receivedGoods: Number(self.isReceive),
-                            reason: self.cause,
-                            refundAmount: parseInt(self.refundPrice * 100),
-                            remark: self.remark,
-                            images: self.imageList,
-                        })
-                        .then((res) => {
-                            self.fn.getMsgTpls(
-                                    res.data,
-                                self.refundType === "1" ? 4 : 5,
-                                () => {
-                                    self.router.back();
-                                }
-                            );
-                        });
+                    self.take(function () {
+                        self.api
+                            .post("/AfterSale/UpdateApply", {
+                                id: Number(self.applyId),
+                                orderId: self.orderId,
+                                orderItemId: self.orderItemId,
+                                type: self.refundType === "1" ? 1 : 0,
+                                receivedGoods: Number(self.isReceive),
+                                reason: self.cause,
+                                refundAmount: parseInt(self.refundPrice * 100),
+                                remark: self.remark,
+                                images: self.imageList,
+                            })
+                            .then((res) => {
+                                self.api
+                                    .post(
+                                        "/Subscription/Subscribe",
+                                        {
+                                            type: type,
+                                            objectId: res.data,
+                                        },
+                                        { pass: true }
+                                    )
+                                    .then(() => {});
+                                self.router.back();
+                            });
+                    });
                 } else {
                     // 提交申请
                     self.take(function () {
@@ -383,13 +390,17 @@ export default {
                                 images: self.imageList,
                             })
                             .then((res) => {
-                                self.fn.getMsgTpls(
-                                    res.data,
-                                    self.refundType === "1" ? 4 : 5,
-                                    () => {
-                                        self.router.back();
-                                    }
-                                );
+                                self.api
+                                    .post(
+                                        "/Subscription/Subscribe",
+                                        {
+                                            type: type,
+                                            objectId: res.data,
+                                        },
+                                        { pass: true }
+                                    )
+                                    .then(() => {});
+                                self.router.back();
                             });
                     });
                 }
@@ -408,7 +419,8 @@ export default {
                 .then((res) => {
                     uni.requestSubscribeMessage({
                         tmplIds: res.data,
-                        complete: () => {
+                        complete: (res) => {
+                            console.log("requestSubscribeMessage", res);
                             callback();
                         },
                         fail: (err) => {

src/pages/pay/result.vue

@@ -196,17 +196,20 @@ export default {
 
     async onShow() {
         const self = this;
+        await self.fn.init();
 
         self.type = self.$mp.query.type || "success";
         self.orderId = self.$mp.query.orderId;
         self.price = self.$mp.query.price;
         self.sub = self.$mp.query.sub;
-        self.fn.getMsgTpls(self.orderId, self.type === "success" ? 2 : 1);
+        setTimeout(()=>{
+            
+        // self.fn.getMsgTpls(self.orderId, self.type === "success" ? 2 : 1);
+        })
         if (this.orderId && self.type === "success") {
             this.getOrderData();
             this.getEnablePoints();
         }
-        await self.fn.init();
     },
 
     onReachBottom() {
@@ -296,9 +299,6 @@ export default {
             const self = this;
 
             self.page = 1;
-            uni.showLoading({
-                title: "加载中...",
-            });
             self.api
                 .get("/Product/GetHHSGProductList", {
                     pageIndex: self.page,
@@ -306,7 +306,6 @@ export default {
                     
                 })
                 .then((res) => {
-                    uni.hideLoading();
                     uni.stopPullDownRefresh();
                     let data = JSON.parse(res.data.list);
                     if (data.length) {

src/pages/user/index.vue

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