jufubao-base 1.0.243-beta203 → 1.0.243-beta205

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.243-beta203",
+  "version": "1.0.243-beta205",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseAfterSales/JfbBaseAfterSales.vue

@@ -112,6 +112,9 @@
           </view>
           <view class="_main">抱歉，该订单已无可申请售后商品</view>
           <view class="_sub">若您对商品售后有疑问，请联系客服处理</view>
+          <view style="margin-top: 40rpx;">
+            <xd-button type="primary" width="360rpx" @click="toAfterSaleDetail">售后详情</xd-button>
+          </view>
         </view>
         <view slot="btn"></view>
       </xd-dailog>
@@ -156,6 +159,7 @@
         service_product_list: [],
         customer_feedback: "",
         showDialog: false,
+        last_service_order_id: "",
         
         productList: [],
         afterSalesTypes: [],
@@ -287,7 +291,8 @@
           }
         }).then(res => {
           this.$xdHideLoading();
-          const { product_list, base_info } = res;
+          const { product_list, base_info, last_service_order_id } = res;
+          this.last_service_order_id = last_service_order_id;
           if(product_list.length === 0){
             this.showDialog = true;
           }
@@ -311,6 +316,11 @@
           }
         })
       },
+      toAfterSaleDetail(){
+        this.$xdUniHelper.navigateTo({
+          url: `${this.refundStepPath}?service_order_id=${this.last_service_order_id}`,
+        });
+      },
       handleApplyRefund(){
         let { order_id, after_sale_method, after_sale_type, customer_feedback } = this;
         if(!after_sale_type) {
@@ -569,7 +579,7 @@
       }
 
       .no_after_prod{
-        padding: 100rpx 0;
+        padding: 100rpx 0 20rpx;
         font-size: 28rpx;
         ._icon{
           margin-bottom: 20rpx;

package/src/components/JfbBaseAfterSalesDetail/JfbBaseAfterSalesDetail.vue

@@ -84,7 +84,7 @@
             <view class="sec_tag _new">新商品</view>
           </view>
           <view class="sec_body">
-            <SecProd v-for="(item,i) in newProductList" :key="i" :item="item"></SecProd>
+            <SecProd class="sec_prod" v-for="(item,i) in newProductList" :key="i" :item="item"></SecProd>
           </view>
         </view>
 
@@ -282,7 +282,7 @@
           styles: this.styles,
           title: "提示",
           width: '90%',
-          content: '确定撤销当前工单吗？',
+          content: '确定取消当前工单吗？',
           confirmText: '确认',
           isHtml: true,
           cancelText: '取消',
@@ -295,9 +295,10 @@
                   service_order_id: this.service_order_id
                 }
               }).then(res => {
-                this.$xdUniHelper.navigateTo({
-                  url: this.serviceListPath
-                })
+                this.p_getAfterServiceOrder();
+                // this.$xdUniHelper.navigateTo({
+                //   url: this.serviceListPath
+                // })
               })
             }
             else{
@@ -508,6 +509,7 @@
                 border-radius: 24rpx;
                 color: #CCCCCC;
                 border: 1px solid #CCCCCC;
+                text-align: center;
               }
             }
           }

package/src/components/JfbBaseAfterSalesList/JfbBaseAfterSalesList.vue

@@ -250,7 +250,7 @@
             this.page_token = 1;
             this.getList();
           })
-        })
+        }, '确定取消当前工单吗？')
       },
       handleDel(item){
         this.handleConfirm(() => {
@@ -263,7 +263,7 @@
             this.page_token = 1;
             this.getList();
           })
-        })
+        }, '确定删除当前工单吗？')
       },
       getList() {
         this.$xdShowLoading({});
@@ -304,12 +304,12 @@
           url: `${this.afterSalesDetailPath}?service_order_id=${item.service_order_id}`,
         });
       },
-      handleConfirm(cb){
+      handleConfirm(cb, content){
         this.$xdConfirm({
           styles: this.styles,
           title: "提示",
           width: '90%',
-          content: '确定删除当前工单吗？',
+          content: content,
           confirmText: '确认',
           isHtml: true,
           cancelText: '取消',
@@ -380,11 +380,11 @@
         border-bottom: 1px solid #DDD;
         
         .filter_item{
-          margin: 0 40rpx;
+          margin: 0 110rpx;
           font-size: 28rpx;
           color: var(--tab-color);
           &.active{
-            border-bottom: 1px solid var(--active-tab-color);
+            border-bottom: 2px solid var(--active-tab-color);
             color: var(--active-tab-color);
           }
         }