售后修改

src/pages/index/index.vue

@@ -845,7 +845,7 @@ export default {
         cancelOrder(val) {
             this.fn
                 .showModal({
-                    content: "确认取消该订单，并退款",
+                    content: "确认取消该订单，并全部退款",
                 })
                 .then((res) => {
                     if (res.confirm) {

src/pages/index/refund.vue

@@ -64,7 +64,8 @@
             </label>
         </radio-group>
         <div class="btn-box">
-            <span class="btn" @click="submit">确定</span>
+            <span class="btn all-btn" @click="cancelOrder">全部退款</span>
+            <span class="btn" @click="submit">退款已选中</span>
         </div>
     </div>
 </template>
@@ -144,7 +145,7 @@ export default {
                 return this.fn.showToast("请选择退货项");
             }
             if (this.curGoodItemIds.length === this.orderData.validItemNum) {
-                return this.fn.showToast("全部退款请选择取消订单");
+                return this.fn.showToast("退款所有请选择全部退款");
             }
             if (!this.curReason) {
                 return this.fn.showToast("请选择退货原因");
@@ -180,6 +181,49 @@ export default {
                     }
                 });
         },
+
+        // 取消订单
+        cancelOrder() {
+            let val = this.orderData;
+            this.fn
+                .showModal({
+                    content: "确认取消该订单，并全部退款",
+                })
+                .then((res) => {
+                    if (res.confirm) {
+                        if (val.loading) {
+                            return;
+                        }
+                        val.loading = true;
+                        uni.showLoading({
+                            title: "提交中...",
+                            mask: true,
+                        });
+
+                        this.api
+                            .post(
+                                "/Order/Cancel",
+                                {
+                                    query: true,
+                                    id: val.orderInfo.id,
+                                },
+                                { pass: true }
+                            )
+                            .then((res) => {
+                                uni.hideLoading();
+                                val.loading = false;
+                                if (res.success) {
+                                    this.fn.showToast("取消成功");
+                                    this.router.back();
+                                } else {
+                                    this.fn.showToast(
+                                        "取消失败：" + res.message
+                                    );
+                                }
+                            });
+                    }
+                });
+        },
     },
 
     // 数据计算
@@ -231,9 +275,12 @@ export default {
     z-index: 100;
     background-color: #fff;
     padding: px(40);
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     .btn {
         display: block;
-        width: 100%;
+        width: 47%;
         height: px(110);
         border-radius: px(10);
         color: #fff;
@@ -241,6 +288,10 @@ export default {
         line-height: px(110);
         background-color: rgb(0, 188, 38);
     }
+    .all-btn {
+        background-color: #f3f3f3;
+        color: #666;
+    }
 }
 .item-list {
     padding: px(20) px(40);

src/pages/manage/add-good-form.vue

@@ -1073,7 +1073,7 @@ export default {
                 hotSaleRecommendIds: [],
                 businessRecommendIds: [],
                 participated: false,
-                video: "",
+                participatedBox:false,
                 skuInfo: skuInfo,
             };
             if(sendData.baseInfo.weight){
@@ -1101,7 +1101,7 @@ export default {
                 );
             }
             this.submitLoading = true;
-            this.api.post("/product/SaveEdit", sendData).then((res) => {
+            this.api.post("/product/SaveEdit", sendData,{pass:true}).then((res) => {
                 this.submitLoading = false;
                 if (res.success) {
                     if (type === "next") {

src/pages/manage/edit-good-form.vue

@@ -1218,7 +1218,7 @@ export default {
                 );
             }
             this.submitLoading = true;
-            this.api.post("/product/SaveEdit", sendData).then((res) => {
+            this.api.post("/product/SaveEdit", sendData,{pass:true}).then((res) => {
                 this.submitLoading = false;
                 if (res.success) {
                     if (type === "next") {

src/pages/manage/index.vue

@@ -55,7 +55,7 @@
 
         <button class="btn" @click="layout">退出登录</button>
 
-        <div class="ver">0.2.93</div>
+        <div class="ver">0.2.95</div>
     </div>
 </template>