jufubao-mall 2.0.83-beta2 → 2.0.83

package/get.package.path.js

@@ -0,0 +1,22 @@
+'use strict';
+
+/**
+ * @description 第三方库
+ * @param threePackagePath {String} 第三方库所在项目路径存放路径路
+ * @param packname {String} 包名字
+ * @returns {string|*}
+ */
+const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
+  if(packname === 'gxd-commands-bussiness') {
+    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
+  }
+
+  if (packname === 'gxd-uni-library-editx') {
+    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
+  }
+
+};
+
+module.exports = {
+  getPackagePath
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.83-beta2",
+  "version": "2.0.83",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -102,7 +102,7 @@
                   <xd-list-item v-if="shop.takeoutTimeList" :label="shop.time_label" show-right :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" @click="toSetTakeoutTime(shopIndex,shop)" class="xd-my-list-item">
                     <view style="">{{shop.takeoutTime ? shop.takeoutTime.dateTime : '请选择'}}</view>
                   </xd-list-item>
-                </template>
+                </template> 
               </template>
             </view>
             <!-- <xd-list-item v-if="shop.delivery_message" :label="shop.delivery_message" paddingLR="48rpx" size="large"></xd-list-item> -->
@@ -132,6 +132,9 @@
             <xd-list-item v-if="showLogisticsAmount&&main_show_delivery_price==='Y'" label="商品运费" :paddingLR="isCardLayout ? '32rpx' : '48rpx'">
               <xd-unit :price="orderFee.user_logistics_amount_origin" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
             </xd-list-item>
+            <xd-list-item v-if="orderFee.main_user_server_amount" label="平台服务费" :paddingLR="isCardLayout ? '32rpx' : '48rpx'">
+              <xd-unit :price="orderFee.main_user_server_amount" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
+            </xd-list-item>
           </view>
           <view v-if="showPrice === 'Y' || otherPayMethod.filter(it => it.method!=='third').length" class="money_box">
             <template v-if="showPrice === 'Y'">
@@ -1554,6 +1557,7 @@
           product_amount: res.product_amount,
           plus_saving_money: res.plus_saving_money,
           origin_amount: res.origin_amount,
+          main_user_server_amount: res.main_user_server_amount,
         }
         //支付方式跟用户相关，与订单无关。
         //只获取一次。

package/src/components/JfbMallProductInfo/JfbMallProductInfo.vue

@@ -832,8 +832,7 @@
           }
         }).then(res => {
 
-          //res = {"base_info":{"product_id":66359621,"partner_id":161,"product_type":"good","category_id":142028,"product_name":"LUOLAI\/罗莱家纺月冉晓杏全棉可水洗夏被","sub_title":"","thumb":"\/uploads\/20250609\/b24185b5c38d3018cadf48c91d159e62.jpg","product_tags":[],"market_tags":[],"tags":[],"prices":{"sale_price":29000,"activity_price":0,"market_price":59900,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":29000,"n":"","t":"S"},{"p":59900,"n":"","t":"U"}]},"sale_num":4,"region_limit_tpl_id":"MxAZmuFFEX_wzGPmnoUYF","channel_code":"anVmdWJhb3w2NjM1OTYyMQ%3D%3D","notice_text":""},"images":[{"src":"\/uploads\/20250611\/90b6ec501ea7591fc006871c1fb78869.jpg"},{"src":"\/uploads\/20250609\/dec58372f4e7f1ef1ee8792820104e1f.jpg"},{"src":"\/uploads\/20250609\/27300fe6c336db75b18593823b5471cc.jpg"},{"src":"\/uploads\/20250609\/0ce25a57e372377223ec76d45409bfe4.jpg"},{"src":"\/uploads\/20250609\/9c3a9c7bd8d9361c23aee0d64c47409e.jpg"}],"videos":[],"parameters":[{"label":"品牌","value":"LUOLAI\/罗莱家纺","key":"brand"}],"delivery_methods":[{"label":"快递配送","value":"logistics"}],"brand_info":{"brand_id":40064,"brand_name":"LUOLAI\/罗莱家纺","brand_icon":"https:\/\/jfb-public-images.oss-cn-qingdao.aliyuncs.com\/admin-upload\/202105081449057244.jpg?x-oss-process=style\/common","brand_type":"MA","supplier_id":1358505},"skus":[{"product_sku":70199044,"standards":[{"attr_id":"","name":"月冉晓杏全棉可水洗夏被","value":"150*200cm\/950g","image":"\/\/img1-b.jufubao.cn\/uploads\/20250611\/a9c8fd6dc54918eb6687c65fea034e55.jpg?ver=1749625095120","desc":""}],"prices":{"sale_price":29000,"activity_price":0,"market_price":59900,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":29000,"n":"","t":"S"},{"p":59900,"n":"","t":"U"}]},"enabled":true},{"product_sku":70199045,"standards":[{"attr_id":"","name":"月冉晓杏全棉可水洗夏被","value":"200*230cm\/1450g","image":"\/\/img1-b.jufubao.cn\/uploads\/20250611\/0eca2b62949531ce2e22137ab7580a2c.jpg?ver=1749625100584","desc":""}],"prices":{"sale_price":36600,"activity_price":0,"market_price":69900,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":36600,"n":"","t":"S"},{"p":69900,"n":"","t":"U"}]},"enabled":true}],"sms_activity":{"status":"","activity_type":"","activity_tips":"","activity_price":0,"end_time":0,"start_time":0,"distance_start_time":0,"distance_end_time":0,"max_buy_num":0,"is_today":""},"similar_products":[],"request_id":"c4fa548ce8fa2185"}
-
+          //res = {"base_info":{"product_id":66845221,"partner_id":161,"product_type":"good","category_id":141883,"product_name":"雀氏玩彩派小规格纸尿裤\/拉拉裤","sub_title":"","thumb":"\/uploads\/20260420\/296831222afb2f9409ce6a3504b0a910.jpg","product_tags":[],"market_tags":[],"tags":[],"prices":{"sale_price":4000,"activity_price":0,"market_price":5990,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":4000,"n":"","t":"S"},{"p":5990,"n":"","t":"U"}]},"sale_num":7,"region_limit_tpl_id":"tNveLAGXZiFUkwCrV3OVj","channel_code":"anVmdWJhb3w2Njg0NTIyMQ%3D%3D","notice_text":""},"images":[{"src":"\/uploads\/20260420\/45ecf7c80566ad26c3f6228f4637045a.jpg"},{"src":"\/uploads\/20260420\/b2106b35bd21ab2aaab0aa8657cd60a0.jpg"},{"src":"\/uploads\/20260420\/07ea8eb581a65d31fc8c2c62fb3278a5.jpg"},{"src":"\/uploads\/20260420\/00d0e6cf38a35350fbe7194ad7aaf184.jpg"},{"src":"\/uploads\/20260420\/d062963ef139bc7f92af988f666dc23e.jpg"}],"videos":[],"parameters":[{"label":"品牌","value":"Chiaus\/雀氏","key":"brand"}],"delivery_methods":[{"label":"快递配送","value":"logistics"}],"brand_info":{"brand_id":104993,"brand_name":"Chiaus\/雀氏","brand_icon":"\/uploads\/20260420\/182197dd71e55725c9a4d0268666169b.jpg","brand_type":"MA","supplier_id":1359319},"skus":[{"product_sku":70559700,"standards":[{"attr_id":"","name":"规格","value":"纸尿裤s码28片","image":"\/\/img-b.jufubao.cn\/uploads\/20260420\/8422ea7a61612b2b4409946d4ef6278c.jpg?ver=1776667353534","desc":""}],"prices":{"sale_price":4000,"activity_price":0,"market_price":5990,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":4000,"n":"","t":"S"},{"p":5990,"n":"","t":"U"}]},"enabled":true},{"product_sku":70559701,"standards":[{"attr_id":"","name":"规格","value":"纸尿裤M码26片","image":"\/\/img1-b.jufubao.cn\/uploads\/20260420\/d1c5a3287280b6d0015ae20817b4b7cd.png?ver=1776667360202","desc":""}],"prices":{"sale_price":4000,"activity_price":0,"market_price":5990,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":4000,"n":"","t":"S"},{"p":5990,"n":"","t":"U"}]},"enabled":true},{"product_sku":70559702,"standards":[{"attr_id":"","name":"规格","value":"纸尿裤L码24片","image":"\/\/img1-b.jufubao.cn\/uploads\/20260420\/32da49d6b25e690b3de2872207eca0a4.png?ver=1776667367077","desc":""}],"prices":{"sale_price":4000,"activity_price":0,"market_price":5990,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":4000,"n":"","t":"S"},{"p":5990,"n":"","t":"U"}]},"enabled":true},{"product_sku":70559703,"standards":[{"attr_id":"","name":"规格","value":"纸尿裤XL码22片","image":"\/\/img1-b.jufubao.cn\/uploads\/20260420\/9b5a229a5585734b46032d4581e5cb80.png?ver=1776667373241","desc":""}],"prices":{"sale_price":4000,"activity_price":0,"market_price":5990,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":4000,"n":"","t":"S"},{"p":5990,"n":"","t":"U"}]},"enabled":true},{"product_sku":70559704,"standards":[{"attr_id":"","name":"规格","value":"纸尿裤XXL码20片","image":"\/\/img1-b.jufubao.cn\/uploads\/20260420\/09df8070e5800397fb911726e8db30c2.png?ver=1776667379739","desc":""}],"prices":{"sale_price":4000,"activity_price":0,"market_price":5990,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":4000,"n":"","t":"S"},{"p":5990,"n":"","t":"U"}]},"enabled":true},{"product_sku":70559705,"standards":[{"attr_id":"","name":"规格","value":"拉拉裤L码24片","image":"\/\/img1-b.jufubao.cn\/uploads\/20260420\/dcba95afbefaf0b2a0f2297b3f4c0e83.png?ver=1776667393453","desc":""}],"prices":{"sale_price":4000,"activity_price":0,"market_price":5990,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":4000,"n":"","t":"S"},{"p":5990,"n":"","t":"U"}]},"enabled":true},{"product_sku":70559706,"standards":[{"attr_id":"","name":"规格","value":"拉拉裤XL码22片","image":"\/\/img1-b.jufubao.cn\/uploads\/20260420\/82104e623678645d88af4f1655d77ae7.png?ver=1776667399277","desc":""}],"prices":{"sale_price":4000,"activity_price":0,"market_price":5990,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":4000,"n":"","t":"S"},{"p":5990,"n":"","t":"U"}]},"enabled":true},{"product_sku":70559707,"standards":[{"attr_id":"","name":"规格","value":"拉拉裤XXL码20片","image":"\/\/img-b.jufubao.cn\/uploads\/20260420\/0d9cba83a0c5e27602f8959d8519c276.png?ver=1776667404852","desc":""}],"prices":{"sale_price":4000,"activity_price":0,"market_price":5990,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":4000,"n":"","t":"S"},{"p":5990,"n":"","t":"U"}]},"enabled":true},{"product_sku":70559708,"standards":[{"attr_id":"","name":"规格","value":"拉拉裤XXXL码18片","image":"\/\/img-b.jufubao.cn\/uploads\/20260420\/4c79cc2882d162ed2d559feb62f900ed.png?ver=1776667411874","desc":""}],"prices":{"sale_price":4000,"activity_price":0,"market_price":5990,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":4000,"n":"","t":"S"},{"p":5990,"n":"","t":"U"}]},"enabled":true}],"sms_activity":{"status":"","activity_type":"","activity_tips":"","activity_price":0,"end_time":0,"start_time":0,"distance_start_time":0,"distance_end_time":0,"max_buy_num":0,"is_today":""},"similar_products":[],"request_id":"e411788a53577bce"}
 
           this.$xdHideLoading({});
           this.loadingInfo = false;

package/src/components/JfbMallProductInfo/XdSku.vue

@@ -721,10 +721,19 @@ export default {
         padding: 0 32rpx;
         margin-right: 16rpx;
         margin-bottom: 32rpx;
-        // max-width: 208rpx;
         box-sizing: border-box;
-        .uni-one-cut(72);
         position: relative;
+        display: flex;
+        align-items: center;
+        min-width: 0;
+
+        &:not(.is-img) {
+          max-width: 100%;
+          .sku_name {
+            flex: 1;
+            min-width: 0;
+          }
+        }
 
         &.is-img {
           border: 1px solid #f8f8f8;
@@ -764,10 +773,10 @@ export default {
           }
           &.horizontal {
             flex-direction: row;
-            // width: 48%;
             min-width: 48%;
             margin-right: 2%;
             line-height: 1;
+            //flex: 1;
             border: 1px solid #f8f8f8;
             display: flex;
             align-items: center;
@@ -803,6 +812,7 @@ export default {
               text-align: left;
               padding: 0 20rpx;
               color: #333;
+              min-width: 0;
               max-width: 100%;
             }
             .active_sku_name {
@@ -810,11 +820,12 @@ export default {
               background-color: var(--bg-color) !important;
             }
             .name {
-              width: 95%;
+              flex: 1;
+              min-width: 0;
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
-              padding-right:10rpx;
+              padding-right: 10rpx;
             }
           }
         }

package/src/components/JfbMallProductInfo/XdSkuJd.vue

@@ -643,10 +643,22 @@ export default {
         padding: 0 32rpx;
         margin-right: 16rpx;
         margin-bottom: 32rpx;
-        // max-width: 208rpx;
         box-sizing: border-box;
-        .uni-one-cut(72);
         position: relative;
+        display: flex;
+        align-items: center;
+        min-width: 0;
+
+        &:not(.is-img) {
+          max-width: 100%;
+          .sku_name {
+            flex: 1;
+            min-width: 0;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+        }
 
         &.is-img{
           border: 1px solid #f8f8f8;
@@ -686,12 +698,12 @@ export default {
           }
           &.horizontal{
             flex-direction: row;
-            // width: 48%;
             min-width: 48%;
             margin-right: 2%;
             line-height: 1;
             border: 1px solid #f8f8f8;
             display: flex;
+            //flex: 1;
             align-items: center;
             border-radius: 10rpx;
             background-color: #f8f8f8;
@@ -725,18 +737,23 @@ export default {
               text-align: left;
               padding: 0 20rpx;
               color: #333;
+              min-width: 0;
               max-width: 100%;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
             }
             .active_sku_name {
               color: var(--main-color) !important;
               background-color: var(--bg-color) !important;
             }
             .name {
-              width: 80%;
+              flex: 1;
+              min-width: 0;
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
-              padding-right:10rpx;
+              padding-right: 10rpx;
             }
           }
         }

package/src/components/JfbMallShop/JfbMallShop.vue

@@ -64,7 +64,7 @@
           </view>
         </view>
       </view>
-      <view class="shop_addr">
+      <view class="shop_addr" v-if="shopInfo.brand_about">
         <view class="addr_foot">
           <view id="textRef" class="textRef">{{shopInfo.brand_about}}
           </view>

package/src/components/JfbMallShop/ShowQp.vue

@@ -203,7 +203,7 @@
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
-  
+
       handleRefreshCode(){
         if (this.$configProject['isPreview']) return;
         this.onRefreshPage();
@@ -223,9 +223,9 @@
             // this.jwxSDK = res.jwxSDK;
           })
           .catch(error => {
-            this.$xdAlert({
-              content: error,
-            });
+            // this.$xdAlert({
+            //   content: error,
+            // });
           });
       },
       refreshQrCode(){

package/.claude/settings.local.json

@@ -1,8 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(git checkout *)",
-      "Bash(npx lessc *)"
-    ]
-  }
-}

package/src/components/JfbMallCategoryAll/Api.js

@@ -1,40 +0,0 @@
-'use strict';
-
-/**
- * @description API模型
- * 建议：Ffff=>模块  Xxxx=>自定义名字
- * 获取单记录(getByIdFfffXxxx)
- * 获取列表记录(getByListFfffXxxx)
- * 添加列表记录(addFfffXxxxx)
- * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
- * 更新列表记录(updateFfffXxxxx)
- * @type {*[]}
- */
-module.exports = [
-  {
-    mapFnName: 'getMallCategoryTree',
-    title: '分类 - 树列表',
-    path: '/product/v1/:xnamespace/category/index',
-    isRule: false,
-    params: {
-      xnamespace: ['xnamespace', 'String', '必选'],
-      group_id: ['分组ID', 'Number', '必选'],
-      need_tag: ['分类', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'getMallCategoryChildren',
-    title: '分类 - 获取子级',
-    path: '/product/v1/:xnamespace/category/children',
-    isRule: false,
-    params: {
-      xnamespace: ['xnamespace', 'String', '必选'],
-      group_id: ['分组ID', 'Number', '必选'],
-      parent_id: ['父级ID 0时只获取第一级', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-];

package/src/components/JfbMallCategoryAll/Attr.js

@@ -1,20 +0,0 @@
-'use strict';
-import style from "./cusAttr/style";
-import advanced from "./cusAttr/advanced";
-import content from "./cusAttr/content";
-
-/**
- * @description 当表单组件中有联动操作时候，使用方法进行返回
- */
-export default {
-  style: [],
-  advanced: [],
-  content: (data, gValue, gColor, oldData={})=>{
-
-    return [
-      ...content(data, gValue,gColor,oldData),
-      ...style(data, gValue,gColor,oldData),
-      ...advanced(data),
-    ].filter(i=>i)
-  },
-};