jufubao-base 1.0.243-beta202 → 1.0.243-beta203

package/package.json

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

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

@@ -94,7 +94,7 @@
             <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">
@@ -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>
@@ -452,6 +452,10 @@
           color: #333333;
           font-weight: 500;
           margin-bottom: 24rpx;
+
+          .sec_prod + .sec_prod{
+            margin-top: 24rpx;
+          }
         }
         .sec_body{
           font-size: 24rpx;
@@ -535,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/JfbBaseAfterSalesList/JfbBaseAfterSalesList.vue

@@ -58,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>
@@ -74,7 +77,7 @@
             </view>
             <view class="service_foot">
               <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" @click.stop="handleDel(item)">删除</view>
+              <view v-if="item.is_show_delete_btn === 'Y'" class="opt_btn default" @click.stop="handleDel(item)">删除</view>
             </view>
           </view>
         </view>
@@ -205,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;
@@ -411,6 +427,10 @@
               margin-right: 16rpx;
             }
           }
+          .service_type{
+            display: flex;
+            align-items: center;
+          }
         }
         .service_body{
           .service_number{

package/src/components/JfbBaseCardDetailEntry/Attr.js

@@ -26,6 +26,17 @@ export default {
           });
       },
     },
+    {
+      label: "是否展示主业务线",
+      ele: "xd-radio",
+      valueKey: "isShowBuss",
+      groupKey:'content',
+      value: 'N',
+      list: [
+        {label: "展示", value: "Y"},
+        {label: "隐藏", value: "N"},
+      ]
+    },
     {
       label: '票券解绑成功回跳地址:',
       ele: 'xd-select-pages-path',

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -51,14 +51,12 @@
           <view class="card_sec">券号：{{ info.card_number }}</view>
           <view class="card_sec">有效期：{{ info.end_time }}</view>
           <view class="card_sec">
-            余额：{{ info.card_point }}{{ info.unit }}
-            <text v-if="info.other_card_point && info.card_point_type === 2"
+            <text>{{isShowBuss==='Y'?info.main_business_code_name:''}}余额：{{ info.card_point }}{{ info.unit }}</text>
+            <text
+              v-if="info.other_card_point && info.card_point_type === 2"
               style="font-size: 24rpx;margin-left: 20rpx;"
             >(购买其他物品可抵：{{info.other_card_point}} {{ info.unit }})</text>
           </view>
-          <!-- <view class="card_other" v-if="info.other_card_point && info.card_point_type === 2">
-            <text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text>
-          </view> -->
         </view>
       </view>
       <view
@@ -145,6 +143,7 @@ export default {
     return {
       userInfo: null, //用户信息（暂时不可用）
       entryGroupId: '',//加载入口数据组别
+      isShowBuss:'N',//是否展示主营业务线
 
       info: null,
       timeStr: "",
@@ -225,6 +224,7 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
+      this.isShowBuss = getContainerPropsValue(container, 'content.isShowBuss', 'N')
       this.backUrl = getContainerPropsValue(container,  "content.back_url", { value: "" }).value;
       this.shift_url = getContainerPropsValue(container,  "content.shift_url", { value: "" }).value;
       this.give_url = getContainerPropsValue(container,  "content.give_url", { value: "" }).value;
@@ -574,7 +574,7 @@ export default {
       border-radius: 24rpx;
       padding: 24rpx;
 
-      
+
       &-title{
         display: flex;
         font-size: 32rpx;

package/src/components/JfbBaseCardEntry/Attr.js

@@ -61,11 +61,11 @@ export default {
             //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
             //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
           }
-  
+
           //获取返回参数(场景类型名称为必填)
           //获取返回参数(场景类型名称为必填)
           let loading = { close(){}}
-  
+
           //获取显示内容
           if (action === 'screen') {
             XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
@@ -77,9 +77,9 @@ export default {
                 console.error(error);
                 loading.close();
               });
-  
+
           }
-  
+
           //获取返回参数(广告位高度必选项)
           if (action === 'getNewsInfo') {
             XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
@@ -92,7 +92,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //获取产品业务线列表
           if (action === 'namespace') {
             XdBus.getParentApi('getOptionsNamespaces')({})
@@ -105,7 +105,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
             loading = XdBus.getParentApi('loading')({});
@@ -120,7 +120,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //位置列表
           if (action === 'getListPostion') {
             loading = XdBus.getParentApi('loading')({});
@@ -134,7 +134,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //位置创建
           if (action === 'addPostion') {
             loading = XdBus.getParentApi('loading')({});
@@ -149,7 +149,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //位置编辑
           if (action === 'editPostion') {
             loading = XdBus.getParentApi('loading')({});
@@ -164,7 +164,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //位置删除
           if (action === 'deleltePostion') {
             loading = XdBus.getParentApi('loading')({});
@@ -179,7 +179,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //获取广告位内容列表
           if (action === 'getListContent') {
             loading = XdBus.getParentApi('loading')({});
@@ -193,7 +193,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //广告内容创建
           if (action === 'addContent') {
             loading = XdBus.getParentApi('loading')({});
@@ -208,7 +208,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //广告内容编辑
           if (action === 'editContent') {
             loading = XdBus.getParentApi('loading')({});
@@ -223,7 +223,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //广告内容删除
           if (action === 'deleteContent') {
             loading = XdBus.getParentApi('loading')({});
@@ -238,7 +238,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //内容发布
           if (action === 'publish') {
             loading = XdBus.getParentApi('loading')({});
@@ -253,7 +253,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //通知页面进行刷新
           if (action === 'update') {
             loading = XdBus.getParentApi('loading')({});
@@ -276,6 +276,17 @@ export default {
         inline: false,
         notice: '当未设置文案时候，前台页面显示为"<span style="color:red">已登录</span>"，建议不超过<span style="color:red">4</span>个汉字'
       },
+      {
+        label: "是否展示主业务线",
+        ele: "xd-radio",
+        valueKey: "isShowBuss",
+        groupKey:'content',
+        value: data['isShowBuss'] || "N",
+        list: [
+          {label: "展示", value: "Y"},
+          {label: "隐藏", value: "N"},
+        ]
+      },
       {
         label: "是否展示核销二维码",
         ele: "xd-radio",

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -211,7 +211,7 @@
                       <text>{{item.end_time}}</text>
                     </view>
                     <view class="card-list__yue">
-                      <text>余额：</text>
+                      <text>{{isShowBuss==='Y'?item.main_business_code_name:''}}余额：</text>
                       <text>{{item.card_point}} {{ item.unit }}</text>
                     </view>
                     <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2">
@@ -388,7 +388,7 @@
               <text>{{item.end_time}}</text>
             </view>
             <view class="card-list__yue">
-              <text>余额：</text>
+              <text>{{item.main_business_code_name}}余额：</text>
               <text>{{item.card_point}} {{ item.unit }}</text>
             </view>
             <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2">
@@ -511,6 +511,7 @@ export default {
       inCallbackUrlOrg:'',//是否带有回调地址
       isChange:'N',
       isTransfering:'N',
+      isShowBuss:'N',
 
       //提示文案
       noticeBackgroundColor: "",
@@ -619,6 +620,7 @@ export default {
       this.cardLayout = getContainerPropsValue(container,"content.cardLayout","1");
       this.changeUrl = getContainerPropsValue(container,"content.change_url",{value: ""}).value;
       this.disabledUrl = getContainerPropsValue(container,"content.disabled_url",{value: ""}).value;
+      this.isShowBuss = getContainerPropsValue(container,'content.isShowBuss', 'N')
       this.bindUrl = getContainerPropsValue(container,"content.bind_url",{value: ""}).value;
       this.detailUrl = getContainerPropsValue(container,"content.detail_url",{value: ""}).value;
       this.confirmUrl = getContainerPropsValue(container,"content.confirm_url",{value: ""}).value;

package/src/components/JfbBaseCardEntry/Mock.js

@@ -3,6 +3,25 @@
 module.exports = {
   getListEntryCardBind: {
     "list": [
+      {"card_number":"101001000006820",
+        "card_point":4989,
+        "card_type":"59",
+        "card_type_name":"多余额福卡2",
+        "unit":"点",
+        "end_time":"2024-09-09",
+        "is_valid":"Y",
+        "main_business_code_name":"电影(勿改)、蛋糕(勿改)",
+        "other_card_point":3991,
+        "is_exchange":"N",
+        "card_point_type":2,
+        "business_codes":["cake","market","movie"],
+        "is_login":"N",
+        "consume_type":"1",
+        "card_use_rule":"可凭本票券到电影(勿改)、商城(对应百货)(勿改)、蛋糕(勿改)使用",
+        "is_transfering":"N",
+        "show_name":"多余额福卡2",
+        "is_show_baseinfo":"N","is_gift":"N"
+      },
       {
         "card_number": "101001000008422",
         "card_point": 100000,
@@ -16,7 +35,7 @@ module.exports = {
         "is_exchange": "N",
         "is_transfering":"Y",
         "card_point_type": 1,
-        "is_login":'Y',
+        "is_login":'N',
         "is_gift":"Y",
         "business_codes": ["health"]
       }, {

package/src/components/JfbBaseCardGive/JfbBaseCardGive.vue

@@ -27,9 +27,7 @@
           <view class="card_info">
             <view class="card_type">券号：{{ info.card_number }}</view>
             <view class="card_sec">有效期：{{ info.end_time }}</view>
-            <view class="card_sec"
-              >余额：{{ info.card_point }}{{ info.unit }}</view
-            >
+            <view class="card_sec">余额：{{ info.card_point }}{{ info.unit }}</view>
             <view
               class="card_other"
               v-if="info.other_card_point && info.card_point_type === 2"
@@ -136,7 +134,7 @@
             <xd-button @click="toSeeShareImg" width="260rpx" type="primary" size="small"
               >查看分享图片</xd-button>
           </view>
-          
+
           <!-- #endif -->
         </view>
       </xd-dailog>

package/src/components/JfbBaseCardInfoEntry/Attr.js

@@ -26,30 +26,6 @@ export default {
           });
       },
     },
-    {
-      label: '票券绑定成功回跳地址:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'back_url',
-      groupKey:'advanced',
-      placeholder: '请选择票券绑定成功回跳地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '我的票券跳转地址:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'my_card_url',
-      groupKey:'advanced',
-      placeholder: '请选择我的票券跳转地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
     {
       label: '票券号码框自定义文案:',
       ele: 'el-input',
@@ -80,6 +56,41 @@ export default {
         {label: "是", value: "Y"},
         {label: "否", value: "N"},
       ]
-    }
+    },
+    {
+      label: "是否展示主业务线",
+      ele: "xd-radio",
+      valueKey: "isShowBuss",
+      groupKey:'content',
+      value: 'N',
+      list: [
+        {label: "展示", value: "Y"},
+        {label: "隐藏", value: "N"},
+      ]
+    },
+    {
+      label: '票券绑定成功回跳地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'back_url',
+      groupKey:'advanced',
+      placeholder: '请选择票券绑定成功回跳地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '我的票券跳转地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'my_card_url',
+      groupKey:'advanced',
+      placeholder: '请选择我的票券跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
   ],
 };

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -85,7 +85,7 @@
               <text>{{info.end_time}}</text>
             </view>
             <view class="card-list__yue" v-if="isShowBalance">
-              <text>余额：</text>
+              <text>{{isShowBuss==='Y'?info.main_business_code_name:''}}余额：</text>
               <text>{{info.card_point}} {{ info.unit }}</text>
             </view>
             <view class="card-list__other" v-if="info.is_bind_show_other_point === 'Y' && info.other_card_point && info.card_point_type === 2">
@@ -158,6 +158,7 @@ export default {
       card_pwd_placeholder: "",
       showInfo: false,
       entryGroupId: '',//加载入口数据组别
+      isShowBuss:'N',//是否展示主营业务线
 
       qrcode: "", //二维码
       showForm: true,
@@ -242,7 +243,8 @@ export default {
             this.handlerAfterBindCard(res);
           })
           .catch();
-      } else {
+      }
+      else {
         jfbRootExec("pwdCardBindEntry", {
           vm: this,
           data: {
@@ -313,6 +315,7 @@ export default {
       this.card_pwd_placeholder = getContainerPropsValue(container, "content.card_pwd_placeholder", "请输入密码");
       this.my_card_url = getContainerPropsValue(container, 'content.my_card_url', { value: "" }).value;
       this.is_show_balance = getContainerPropsValue(container, 'content.is_show_balance', "N");
+      this.isShowBuss = getContainerPropsValue(container, 'content.isShowBuss', 'N')
       //'wechat_mini_program|default'
       this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
     },

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -312,8 +312,7 @@ export default {
         if(res.receive_method !== "batch") {
           if(res.can_take === "Y" && res.has_times === "Y" && list.length > 0){
           if (this.isPreview) {
-            console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
-            this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
+            this.isShow = getContainerPropsValue(this.container, "content.is_show_dailog", 'Y') === 'N';
             }else this.isShow = true;
           }else{
             this.handleCardBindClose();
@@ -324,8 +323,8 @@ export default {
           } else {
             if(res.can_take === "Y"){
             if (this.isPreview) {
-              console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
-              this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
+              console.log(getContainerPropsValue(this.container, "content.is_show_dailog", 'Y'))
+              this.isShow = getContainerPropsValue(this.container, "content.is_show_dailog", 'Y') === 'N';
               }else this.isShow = true;
             }else{
               this.handleCardBindClose();
@@ -374,7 +373,7 @@ export default {
           });
           setTimeout(()=>{
             this.getDialogList();
-          },2000)          
+          },2000)
           return;
         }
         this.order_num = res.tmp_order_number;

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -195,7 +195,8 @@
         jwxSDK: null,
         refresh: true, //onshow是否刷新数据
         showLocationDialog: false,
-        cityPath: ''
+        cityPath: '',
+        resource_shop_id: ''
       }
     },
     watch: {
@@ -252,7 +253,7 @@
       // #endif
     },
     methods: {
-      async onJfbLoad(options) {
+      async onJfbLoad(options) {        
         this.xnamespace = this.projectAttr.business_code
         this.getUserInfo()
         this.options = options
@@ -281,6 +282,7 @@
           }).then(res => {
             if (res && res.list.length > 0) {
               this.shop_id = res.list[0].shop_id;
+              this.resource_shop_id = res.list[0].resource_shop_id;
               this.shopName = res.list[0].resource_shop_name;
               this.showMask = true;
               this.showDialog = true;
@@ -291,6 +293,7 @@
           })
         } else {
           this.shop_id = this.options.shop_id;
+          this.resource_shop_id = this.options.resource_shop_id;
           this.p_getAsyncStep();
         }
       },
@@ -372,12 +375,16 @@
       p_getQuickPayQRCode() {
         return new Promise((resolve, reject) => {
           this.$xdShowLoading({});
+          let data = {
+            shop_id: this.shop_id,
+            temp_order_id: this.temp_order_id,
+            business_code: this.xnamespace,
+            resource_shop_id: this.resource_shop_id
+          }
+          if(data.resource_shop_id) delete data.shop_id
           jfbRootExec("getConsumpCode", {
             vm: this,
-            data: {
-              shop_id: this.shop_id,
-              temp_order_id: this.temp_order_id,
-            }
+            data: data
           }).then(res => {
             this.$xdHideLoading();
             this.plusDiscount = res.plus_discount

package/src/components/JfbBaseNoticeDialog/Attr.js

@@ -271,6 +271,7 @@ export default {
         list: [
           { label: '全部用户', value: 'all' },
           { label: '仅会员', value: 'vip' },
+          { label: '非会员', value: 'notvip' },
         ]
       },
       {

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -152,10 +152,14 @@ export default {
             } else {
               if(this.showGroup==='all') {
                 this.handlePop();
-              }else {        
+              } else if(this.showGroup==='vip') {        
                 if(this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP') {
                   this.handlePop();
                 }
+              } else if(this.showGroup==='notvip'){
+                if(!this.getTokenForKey('user_level')) {
+                  this.handlePop();
+                }
               }
             }
           }