jufubao-base 1.0.243-beta204 → 1.0.243-beta206

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.243-beta204",
+  "version": "1.0.243-beta206",
   "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: '取消',
@@ -461,6 +461,9 @@
         .sec_body{
           font-size: 24rpx;
           font-weight: 400;
+          .sec_prod + .sec_prod{
+            margin-top: 24rpx;
+          }
           .sec_item{
             display: flex;
             align-items: center;
@@ -503,12 +506,14 @@
               }
             }
             .sec_r{
-              width: 100rpx;
+              
               ._copy{
+                width: 80rpx;
                 padding: 4rpx 20rpx;
                 border-radius: 24rpx;
                 color: #CCCCCC;
                 border: 1px solid #CCCCCC;
+                text-align: center;
               }
             }
           }

package/src/components/JfbBaseAfterSalesList/JfbBaseAfterSalesList.vue

@@ -58,8 +58,8 @@
                   :size="28"
                 ></xd-font-icon>
                 {{item.business_name}}</view>
-              <view class="service_type" :style="getMethodTypeStyle(item.after_sale_method)">
-                <xd-font-icon :icon="getMethodTypeIcon(item.after_sale_method)" size="32"></xd-font-icon>
+              <view class="service_type" :style="[item.colorStyle]">
+                <xd-font-icon :icon="item.icon" size="32"></xd-font-icon>
                 <view style="margin-left: 8rpx;">{{ item.after_sale_method_name }}</view>
               </view>
             </view>
@@ -196,35 +196,7 @@
 
         this.afterSalesDetailPath = getContainerPropsValue(container, "content.afterSalesDetailPath", { value: "" }).value;
       },
-      getMethodTypeStyle(method){
-        switch (method) {
-          case "refund_and_good":
-            return { color: "#FF5733" };
-          case "refund":
-            return { color: "#FF5733" };
-          case "exchange":
-            return { color: "#2A82E4" };
-          case "again":
-            return { color: "#43CF7C" };
-          case "good":
-            return { color: "#FF8D1A" };
-          case "zero":
-            return { color: "#FF8D1A" };
-          default:
-            return {};
-        }
-      },
-      getMethodTypeIcon(method){
-        let method_icon = {
-          'refund_and_good': "icontuikuan",
-          'refund': "icontuihuo",
-          'exchange': "iconhuanhuo",
-          'again': "iconbufa",
-          'zero': 'iconhuanhuo'
-        }
-        return method_icon[method] || "";
-
-      },
+      
       handleSearch(e){
         console.log("handleSearch",e)
         this.page_token = 1;
@@ -265,6 +237,34 @@
           })
         }, '确定删除当前工单吗？')
       },
+      getMethodTypeStyle(method){
+        switch (method) {
+          case "refund_and_good":
+            return { color: "#FF5733" };
+          case "refund":
+            return { color: "#FF5733" };
+          case "exchange":
+            return { color: "#2A82E4" };
+          case "again":
+            return { color: "#43CF7C" };
+          case "good":
+            return { color: "#FF8D1A" };
+          case "zero":
+            return { color: "#FF8D1A" };
+          default:
+            return {};
+        }
+      },
+      getMethodTypeIcon(method){
+        let method_icon = {
+          'refund_and_good': "icontuikuan",
+          'refund': "icontuihuo",
+          'exchange': "iconhuanhuo",
+          'again': "iconbufa",
+          'zero': 'iconhuanhuo'
+        }
+        return method_icon[method] || "";
+      },
       getList() {
         this.$xdShowLoading({});
         jfbRootExec("getAfterServiceOrderList", {
@@ -285,6 +285,8 @@
                 prod.thumb = getServiceUrl(prod.thumb);
                 return prod;
               })
+              item.colorStyle = this.getMethodTypeStyle(item.after_sale_method);
+              item.icon = this.getMethodTypeIcon(item.after_sale_method);
               return item;
             });
             if (this.page_token === 1) {
@@ -380,11 +382,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);
           }
         }