jufubao-mall 2.0.83 → 2.0.84-beta2

package/.claude/settings.local.json

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

package/package.json

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

package/src/components/JfbMallCart/JfbMallCart.vue

@@ -121,8 +121,16 @@
                               <!-- <xd-unit :price="prod.sale_price" :isOld="false" color="#333" :iconSize="0.3" :fontSize="36"/> -->
                               <CusPrice :iconSize="0.3" :priceSize="36" :showPrice="prod.show_prices"></CusPrice>
                             </view>
+                            <!-- 只要是活动，购买数量都可以设置 -->
                             <xd-number
-                              v-if="prod.status === 'ok'"
+                              v-if="prod.is_activity === 'Y'"
+                              v-model="prod.num"
+                              :max="prod.max_buy !== -1 ? prod.max_buy : 100"
+                              :min="prod.min_buy !== -1 ? prod.min_buy : 1"
+                              @change="(num) => handleCartNumSet(num, prod, i)"
+                            ></xd-number>
+                            <xd-number
+                              v-else-if="prod.status === 'ok'"
                               :disabled="!(prod.status === 'ok')"
                               v-model="prod.num"
                               :max="prod.max_buy !== -1 ? prod.max_buy : 100"
@@ -130,8 +138,9 @@
                               @change="(num) => handleCartNumSet(num, prod, i)"
                             ></xd-number>
                           </view>
-                          <view v-if="showActivityPrice==='Y'&&prod.is_activity==='Y'"
-                            :style="{color: activityPriceTextColor,fontSize:'24rpx',marginTop:'4rpx'}">{{prod.tip?prod.tip:'活动价'}}</view>
+                          <view v-if="prod.tip" :style="{color: activityPriceTextColor,fontSize:'24rpx',marginTop:'4rpx'}">{{ prod.tip }}</view>
+                          <view v-else-if="showActivityPrice==='Y'&&prod.is_activity==='Y'"
+                            :style="{color: activityPriceTextColor,fontSize:'24rpx',marginTop:'4rpx'}">活动价</view>
                         </view>
                       </view>
                     </uni-swipe-action-item>

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -57,8 +57,9 @@
                       </view>
                       <view style="font-size: 28rpx;color:#999">{{prod['product_num'] ? 'x': ''}} {{prod['product_num']}}</view>
                     </view>
-                    <view v-if="showActivityPrice==='Y'&&prod.is_activity==='Y'"
-                      :style="{color:priceTextColor,fontSize:'24rpx'}">{{prod.error_message?prod.error_message:'活动价'}}</view>
+                    <view v-if="prod.error_message" :style="{color:priceTextColor,fontSize:'24rpx'}">{{prod.error_message}}</view>
+                    <view v-else-if="showActivityPrice==='Y'&&prod.is_activity==='Y'"
+                      :style="{color:priceTextColor,fontSize:'24rpx'}">活动价</view>
                   </view>
                 </view>
                 <view v-if="prod.blessingKey" class="wish_comment">

package/get.package.path.js

@@ -1,22 +0,0 @@
-'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
-}