jufubao-base 1.0.243-beta201 → 1.0.243-beta203

package/package.json

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

package/src/components/JfbBaseAfterSales/JfbBaseAfterSales.vue

@@ -78,9 +78,9 @@
           <view class="sec_content">
             <view class="img_list">
               <view class="img_box" v-for="(img, i) in showRefundImages" :key="i">
-                <image :src="img" class="img_item" mode="aspectFit"></image>
+                <image :src="img" class="img_item" mode="aspectFit" @click="handlePreview(i)"></image>
               </view>
-              <view class="img_box img_add" @click="doAddImage">
+              <view v-if="showRefundImages.length < 9" class="img_box img_add" @click="doAddImage">
                 <view class="icon">+</view>
               </view>
             </view>
@@ -105,6 +105,16 @@
           </view>
         </view>
       </xd-down-drawer>
+      <xd-dailog :show.sync="showDialog" :showTitle="false">
+        <view class="no_after_prod">
+          <view class="_icon">
+            <xd-font-icon icon="iconmingchengtubiao" :size="80" :color="mainColor"></xd-font-icon>
+          </view>
+          <view class="_main">抱歉，该订单已无可申请售后商品</view>
+          <view class="_sub">若您对商品售后有疑问，请联系客服处理</view>
+        </view>
+        <view slot="btn"></view>
+      </xd-dailog>
     </view>
   </view>
 </template>
@@ -114,6 +124,7 @@
   import XdButton from "@/components/XdButton/XdButton";
   import XdRadio from "@/components/XdRadio/XdRadio"
   import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer"
+  import XdDailog from "@/components/XdDailog/XdDailog"
   import RefundOrderInfo from "./refundOrderInfo.vue"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseAfterSalesMixin from "./JfbBaseAfterSalesMixin";
@@ -128,7 +139,8 @@
       XdButton,
       XdRadio,
       XdDownDrawer,
-      RefundOrderInfo
+      RefundOrderInfo,
+      XdDailog
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseAfterSalesMixin
@@ -143,6 +155,7 @@
         temp_type: "",
         service_product_list: [],
         customer_feedback: "",
+        showDialog: false,
         
         productList: [],
         afterSalesTypes: [],
@@ -275,6 +288,9 @@
         }).then(res => {
           this.$xdHideLoading();
           const { product_list, base_info } = res;
+          if(product_list.length === 0){
+            this.showDialog = true;
+          }
           this.productList = product_list.map(item => {
             item.product_thumb = getServiceUrl(item.product_thumb, 'size2');
             return item;
@@ -373,6 +389,12 @@
         this.reasonShow = false;
         this.after_sale_type = this.temp_type;
       },
+      handlePreview(i){
+        uni.previewImage({
+          current: i,
+          urls: this.showRefundImages
+        })
+      },
       onJfbScroll(options) {
         // console.log('event.onJfbScroll', options)
       },
@@ -545,6 +567,21 @@
           border-top: 1px solid #F2F2F2;
         }
       }
+
+      .no_after_prod{
+        padding: 100rpx 0;
+        font-size: 28rpx;
+        ._icon{
+          margin-bottom: 20rpx;
+        }
+        ._main{
+          color: #333333;
+          margin-bottom: 16rpx;
+        }
+        ._sub{
+          color: #999999;
+        }
+      }
     }
   }
 </style>

package/src/components/JfbBaseAfterSales/Mock.js

@@ -1,13 +1,6 @@
 'use strict';
 
 module.exports = {
-  
-  getAfterByIdFilmSquate:{},
-  
-  updateAfterFilmPaiqiDate:{},
-  
-  removeAfterFilmAddress:{},
-  
-  addAfterFilmcart:{},
-  
+  getAfterOmsOrder: {"base_info":{"main_order_id":"m788348987084525809","partner_id":185,"site_id":"b7beb73251752cf1","business_code":"cake","freight_price":300,"support_aftersale_method":"[{\"value\":\"refund_and_good\",\"label\":\"\\u9000\\u8d27\"},{\"value\":\"again\",\"label\":\"\\u8865\\u53d1\"},{\"value\":\"exchange\",\"label\":\"\\u6362\\u8d27\"}]","support_refund_method":"part"},"product_list":[{"product_id":60030789,"product_name":"价格日历（185）","sku_id":"0","sku_name":"","product_num":1,"product_thumb":"\/uploads\/20240314\/a9121a540e92f35ec881f883daf6028c.jpg","brand_id":100003,"brand_name":"品牌jls0519","main_order_id":"m788348987084525809","sub_order_id":"s788348987671728370","gift_id":0,"can_use_sale_price":3000,"delivery_method_name":"快递配送","db_from":"online"},{"product_id":60031175,"product_name":"税率测试（货源96折，平台10折）","sku_id":"0","sku_name":"","product_num":1,"product_thumb":"\/uploads\/20241104\/021c99b07d40101e24af67bf416cf429.jpeg","brand_id":100003,"brand_name":"品牌jls0519","main_order_id":"m788348987084525809","sub_order_id":"s788348987671728371","gift_id":0,"can_use_sale_price":0,"delivery_method_name":"快递配送","db_from":"online"}],"request_id":"b85ae3a23d92d509"},
+  getAfterSalesTypeList: {"list":[{"id":59,"type_name":"7天无理由","status":"Y","description":"7天无理由备注","created_time":1748339702,"updated_time":1748339702,"is_show_web":"Y"},{"id":57,"type_name":"接口问题导致退款","status":"Y","description":"影院网络问题、网售系统问题、接口商品下架等","created_time":1733302517,"updated_time":1733302517,"is_show_web":"Y"},{"id":56,"type_name":"客户原因","status":"Y","description":"客户原因","created_time":1717726245,"updated_time":1717726245,"is_show_web":"Y"},{"id":55,"type_name":"账号已达到充值上限","status":"Y","description":"账号已达到充值上限","created_time":1717726196,"updated_time":1717726196,"is_show_web":"Y"},{"id":54,"type_name":"账号异常，接口充值失败","status":"Y","description":"账号异常，接口充值失败","created_time":1717726179,"updated_time":1717726179,"is_show_web":"Y"},{"id":52,"type_name":"影院资源问题","status":"Y","description":"影院资源问题","created_time":1717726146,"updated_time":1717726146,"is_show_web":"Y"},{"id":51,"type_name":"不可抗力因素","status":"Y","description":"不可抗力因素","created_time":1717726130,"updated_time":1717726130,"is_show_web":"Y"},{"id":50,"type_name":"物流异常","status":"Y","description":"物流异常","created_time":1717726089,"updated_time":1717726089,"is_show_web":"Y"},{"id":49,"type_name":"货不及时\/未按照约定时间送达","status":"Y","description":"货不及时\/未按照约定时间送达","created_time":1717726070,"updated_time":1717726070,"is_show_web":"Y"},{"id":47,"type_name":"商品临期","status":"Y","description":"商品临期","created_time":1717725931,"updated_time":1717725931,"is_show_web":"Y"},{"id":45,"type_name":"商品断货","status":"Y","description":"商品断货","created_time":1717725909,"updated_time":1717725909,"is_show_web":"Y"},{"id":43,"type_name":"商品与页面描述不符","status":"Y","description":"商品与页面描述不符","created_time":1717725876,"updated_time":1717725876,"is_show_web":"Y"},{"id":42,"type_name":"商品质量\/故障问题","status":"Y","description":"商品质量\/故障问题","created_time":1717725846,"updated_time":1717725846,"is_show_web":"Y"}],"next_page_token":"","total_size":"13","request_id":"4f6f8d4a44384acc"},
 }

package/src/components/JfbBaseAfterSales/refundOrderInfo.vue

@@ -19,7 +19,7 @@
           </view>
         </view>
         <view v-if="showRadio" style="margin-left: 10rpx;">
-          <xd-radio :value="item.checked" @change="handleChangeRadio(item)"></xd-radio>
+          <xd-radio :value="item.checked" @change="checked => handleChangeRadio(item, checked)"></xd-radio>
         </view>
       </view>
     </view>
@@ -81,11 +81,11 @@
         let params = this.getReturnParams();
         this.$emit("change", params);
       },
-      handleChangeRadio(prod){
+      handleChangeRadio(prod, checked){
         //单选逻辑，选中一个取消其他所有勾选状态
         this.uiList = this.uiList.map(item => {
           if(prod.product_id === item.product_id && prod.sku_id === item.sku_id){
-            return {...item, checked: true};
+            return {...item, checked: checked};
           }
           return {...item, checked: false};
         })

package/src/components/JfbBaseAfterSalesDetail/JfbBaseAfterSalesDetail.vue

@@ -90,11 +90,11 @@
 
         <view class="refund_section">
           <!-- 换货展示 -->
-          <view v-if="after_sale_method==='exchange'" class="sec_title">
+          <view v-if="after_sale_method==='zero'" class="sec_title">
             <view class="sec_tag _refund">退/换商品</view>
           </view>
           <view v-if="refundProductList.length" class="sec_title">
-            <SecProd v-for="(item, i) in refundProductList" :key="i" :item="item"></SecProd>
+            <SecProd class="sec_prod" v-for="(item, i) in refundProductList" :key="i" :item="item"></SecProd>
           </view>
           <view class="sec_body">
             <view class="sec_item" v-for="(item, i) in orderInfoList" :key="i">
@@ -102,7 +102,7 @@
                 <view>{{item.label}}：</view>
                 <view v-if="item.key=='img'" class="img_list">
                   <view class="img_box" v-for="(img, ii) in item.value" :key="ii">
-                    <image :src="img" mode="aspectFit"></image>
+                    <image :src="img" mode="aspectFit" @click="handlePreview(ii)"></image>
                   </view>
                 </view>
                 <view v-else class="sec_l_text" style="color: #333333;">{{item.value}}</view>
@@ -115,7 +115,7 @@
         </view>
       </view>
       <view v-if="baseInfo.is_show_cancel_btn==='Y' || baseInfo.is_show_delete_btn==='Y'" class="bottom_fixed" :style="prod_bottom">
-        <view v-if="baseInfo.is_show_cancel_btn==='Y'" class="opt_btn primary" @click="handleCancel">撤销</view>
+        <view v-if="baseInfo.is_show_cancel_btn==='Y'" class="opt_btn default" @click="handleCancel">取消申请</view>
         <view v-if="baseInfo.is_show_delete_btn==='Y'" class="opt_btn" @click="handleDel">删除</view>
       </view>
     </view>
@@ -155,6 +155,7 @@
         refundProductList: [],
         newProductList: [],
         baseInfo: {},
+        imgList: [],
         //todo
         service_order_id: "",
         after_sale_method: "",
@@ -214,10 +215,11 @@
             imgList = imgList.map(item => {
               return getServiceUrl(item)
             })
+            this.imgList = imgList;
           }catch(e){imgList=[]}
           this.orderInfoList = [
             { label: "订单编号", value:  res.main_order_id, copy: true },
-            { label: "工单编号", value: res.service_order_id, copy: true },
+            { label: "工单编号", value: res.work_order_id, copy: true },
             { label: "申请时间", value: this.$xdUniHelper.getDate( res["created_time"] * 1000 ).fullTime },
             { label: "售后类型", value: res.after_sale_method_name },
             { label: "申请原因", value: res.after_sale_type_name },
@@ -247,6 +249,7 @@
           //新商品
           this.newProductList = res.new_product_list.map(item => {
             item.thumb = getServiceUrl(item.thumb, 'size2');
+            item.after_count = item.buy_count;
             return item;
           })
           //售后类型
@@ -332,6 +335,12 @@
           }
         })
       },
+      handlePreview(i){
+        uni.previewImage({
+          current: i,
+          urls: this.imgList
+        })
+      },
       onJfbScroll(options) {
         // console.log('event.onJfbScroll', options)
       },
@@ -443,6 +452,10 @@
           color: #333333;
           font-weight: 500;
           margin-bottom: 24rpx;
+
+          .sec_prod + .sec_prod{
+            margin-top: 24rpx;
+          }
         }
         .sec_body{
           font-size: 24rpx;
@@ -526,6 +539,12 @@
           & + .opt_btn{
             margin-left: 20rpx;
           }
+          &.default{
+            background: #EFEFEF;
+            border-color: #EFEFEF;
+            color: #999999;
+            width: 140rpx;
+          }
           &.primary{
             background: var(--main-color);
             border-color: var(--main-color);

package/src/components/JfbBaseAfterSalesDetail/secProd.vue

@@ -5,7 +5,11 @@
     </view>
     <view class="prod_info">
       <view class="prod_title">{{ item.product_name }}</view>
-      <view class="prod_number">申请数量：×{{ item.after_count }}</view>
+      <view class="prod_sku">{{ item.product_sku_name }}</view>
+      <view class="prod_number">
+        <view class="i_count" v-if="item.sale_price">单价：{{ $xdUniHelper.divisionFloatNumber(item.sale_price, 100) }} </view>
+        <view class="i_count" v-if="item.after_count">申请数量：×{{ item.after_count }}</view>
+      </view>
     </view>
   </view>
 </template>
@@ -52,6 +56,10 @@
       .prod_number{
         color: #999999;
         font-size: 24rpx;
+        display: flex;
+        .i_count + .i_count{
+          margin-left: 20rpx;
+        }
       }
     }
   }

package/src/components/JfbBaseAfterSalesList/Attr.js

@@ -14,6 +14,29 @@ export default {
         value: data.bodyBgColor || "",
         groupKey: "style",
       },
+      {
+        label: 'tab文字颜色设置:',
+        ele: 'xd-text-and-bgc',
+        groupKey:'style',
+        valueKey: 'menuTabColor',
+        value: data['menuTabColor'] || null,
+        setting: {
+          fontSize: false, //字体大小选择
+          color: true, //文字颜色选项
+          bgColor: false, //背景选项
+          weight: false, //文字粗细
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
       {
         label: "内容配置设置",
         ele: "title",

package/src/components/JfbBaseAfterSalesList/JfbBaseAfterSalesList.vue

@@ -17,7 +17,7 @@
       <view class="fixed_header" :style="{
           top: layoutInfo.top + 'rpx',
         }">
-        <view class="filter_tab">
+        <view class="filter_tab" :style="[menuTabStyle]">
           <view v-for="item in statusTabs" :key="item.value" class="filter_item"
             :class="{active: item.value===status}"
             @click="selectStatusTab(item.value)"
@@ -32,8 +32,9 @@
               v-model="keyword"
               style="width: 100%;"
               confirm-type="search"
-              placeholder="请输入搜索内容"
+              placeholder="请输入商品名称/订单编号"
               @confirm="handleSearch"/>
+            <xd-font-icon v-if="keyword" style="margin: 0 32rpx;" icon="iconshanchu" size="32" color="#BBBBBB" @click.stop="handleClearKeyword"></xd-font-icon>
           </view>
           
         </view>
@@ -57,7 +58,10 @@
                   :size="28"
                 ></xd-font-icon>
                 {{item.business_name}}</view>
-              <view class="service_type" :style="getMethodTypeStyle(item.after_sale_method)">{{ item.after_sale_method_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 style="margin-left: 8rpx;">{{ item.after_sale_method_name }}</view>
+              </view>
             </view>
             <view class="service_body">
               <view class="service_number">服务单号：{{ item.service_order_id }}</view>
@@ -72,8 +76,8 @@
               </view>
             </view>
             <view class="service_foot">
-              <view v-if="item.is_show_cancel_btn === 'Y'" class="opt_btn primary" @click.stop="handleCancel(item)">撤销</view>
-              <view v-if="item.is_show_delete_btn === 'Y'" class="opt_btn" @click.stop="handleDel(item)">删除</view>
+              <view v-if="item.is_show_cancel_btn === 'Y'" class="opt_btn default" @click.stop="handleCancel(item)">取消申请</view>
+              <view v-if="item.is_show_delete_btn === 'Y'" class="opt_btn default" @click.stop="handleDel(item)">删除</view>
             </view>
           </view>
         </view>
@@ -132,6 +136,7 @@
         cardItemRadius: 16,
 
         afterSalesDetailPath: "",
+        menuTabColor: {},
 
       }
     },
@@ -157,6 +162,12 @@
           border: this.cardItemBorder,
           borderRadius: this.cardItemRadius + 'rpx',
         }
+      },
+      menuTabStyle(){
+        return {
+          '--tab-color': this.menuTabColor['color'] || '#333333',
+          '--active-tab-color': this.menuTabColor['actColor'] || this.mainColor,
+        }
       }
     },
     created() {
@@ -181,6 +192,7 @@
         this.cardItemShadow = this.getXdShadow({width:20, color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.cardItemShadow', {}))
         this.cardItemBorder = this.getXdBorder({width:2,color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.cardItemBorder', {}));
         this.cardItemRadius = getContainerPropsValue(container, 'content.cardItemRadius', 16);
+        this.menuTabColor = getContainerPropsValue(container, "content.menuTabColor", {});
 
         this.afterSalesDetailPath = getContainerPropsValue(container, "content.afterSalesDetailPath", { value: "" }).value;
       },
@@ -196,10 +208,23 @@
             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;
@@ -255,7 +280,11 @@
             this.loaded = true;
             this.$xdHideLoading();
             let list = res.list.map(item => {
-              item.thumb = getServiceUrl(item.thumb, 'size2');
+              // item.thumb = getServiceUrl(item.thumb, 'size2');
+              item.product_list = item.product_list.map(prod => {
+                prod.thumb = getServiceUrl(prod.thumb);
+                return prod;
+              })
               return item;
             });
             if (this.page_token === 1) {
@@ -293,6 +322,11 @@
           }
         })
       },
+      handleClearKeyword(){
+        this.keyword = "";
+        this.page_token = 1;
+        this.getList();
+      },
       onJfbScroll(options) {
         // console.log("event.onJfbScroll", options);
       },
@@ -348,9 +382,10 @@
         .filter_item{
           margin: 0 40rpx;
           font-size: 28rpx;
+          color: var(--tab-color);
           &.active{
-            border-bottom: 1px solid var(--main-color);
-            color: var(--main-color);
+            border-bottom: 1px solid var(--active-tab-color);
+            color: var(--active-tab-color);
           }
         }
       }
@@ -392,6 +427,10 @@
               margin-right: 16rpx;
             }
           }
+          .service_type{
+            display: flex;
+            align-items: center;
+          }
         }
         .service_body{
           .service_number{
@@ -450,6 +489,12 @@
             & + .opt_btn{
               margin-left: 20rpx;
             }
+            &.default{
+              background: #EFEFEF;
+              border-color: #EFEFEF;
+              color: #999999;
+              width: 140rpx;
+            }
             &.primary{
               background: var(--main-color);
               border-color: var(--main-color);

package/src/components/JfbBaseBalance/Api.js

@@ -0,0 +1,46 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Points
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getListBaseNewsContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/news-content',
+    isRule: false,
+    params: {
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填', 1],
+      code: ['业务线id', 'String', '选填'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getBalanceDetail',
+    title: '用户资产 - 获取钱包(或积分)余额详情',
+    path: '/pay/v1/property/wallet-detail',
+    isRule: false,
+    params: {
+      method: ['wallet 余额; score 积分;', 'Number', '非必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getBalanceWalletTradeList',
+    title: '用户资产 - 获取钱包(或积分)交易记录列表',
+    path: '/pay/v1/property/wallet-trade/list',
+    isRule: false,
+    params: {
+      wallet_type: ['钱包类型', 'Number', '必选'],
+      page_size: ['每页条数', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];