jufubao-mall 2.0.99 → 2.0.100-beta2

package/.claude/settings.local.json

@@ -0,0 +1,17 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(git checkout *)",
+      "Bash(npx lessc *)",
+      "Bash(python3 *)",
+      "Bash(sips -g pixelWidth -g pixelHeight \"/Users/zxd/Workspaces/jufubao-mall/temp_screenshot.jpg\")",
+      "Bash(identify \"/Users/zxd/Workspaces/jufubao-mall/temp_screenshot.jpg\")",
+      "Bash(sips *)",
+      "Bash(cp src/components/JfbMallResourceShop/cusAttr/content.js /tmp/_check.js)",
+      "Bash(sed -i '' 's|from \"@/utils/AttrTools\"|from \"../../../utils/AttrTools\"|; s|from \"@/utils/Attr/PosterAttr\"|from \"../../../utils/Attr/PosterAttr\"|; s|from \"@/utils/Attr/ProductAttr\"|from \"../../../utils/Attr/ProductAttr\"|' /tmp/_check.js)",
+      "Bash(node --check /tmp/_check.js)",
+      "Bash(rm /tmp/_check.js)",
+      "Bash(node --input-type=module --check)"
+    ]
+  }
+}

package/package.json

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

package/src/components/CusCouponChose/CusCouponChose.vue

@@ -38,8 +38,8 @@
           </view>
           <view class="column-item">
             <view class="column_label">
-              仍需
-              <view class="label_sub">（可使用多张优惠券兑换）</view>
+              仍需支付
+              <view class="label_sub">（可使用多张优惠券支付）</view>
             </view>
             <view class="column_value text-primary">
               <xd-unit
@@ -100,7 +100,7 @@
             type="primary"
             radius="50rpx"
             @click="doTicketPay"
-            >确认兑换</xd-button
+            >确认支付</xd-button
           >
         </view>
       </view>

package/src/components/JfbMallCart/JfbMallCart.vue

@@ -138,14 +138,9 @@
                               @change="(num) => handleCartNumSet(num, prod, i)"
                             ></xd-number>
                           </view>
-                          <view v-if="prod.tip" :style="{color: activityPriceTextColor,fontSize:'24rpx',marginTop:'4rpx'}">
-                            <text v-html="prod.tip"></text>
-                          </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 v-if="showOrderSource==='Y'&&prod.source_from_tip" :style="{color: activityPriceTextColor,fontSize:'24rpx',marginTop:'4rpx'}">
-                            <text v-html="prod.source_from_tip"></text>
-                          </view>
                         </view>
                       </view>
                     </uni-swipe-action-item>
@@ -281,7 +276,6 @@ export default {
       is_border_w: 0,
       is_border_c: "",
       showActivityPrice: 'N',
-      showOrderSource: 'N',
 
       listMargin: {},
       listItemBorder: "",
@@ -491,7 +485,6 @@ export default {
       // this.showActivityPrice = getContainerPropsValue(container, 'content.showActivityPrice', 'N');
       console.log(this.mainColor,'mainColor')
       this.showActivityPrice = gCPVal(container, 'showActivityPrice', 'N');
-      this.showOrderSource = gCPVal(container, 'showOrderSource', 'N');
       //下间距
       // this.padding = getContainerPropsValue(container, "content.padding", 0);
       this.padding = gCPVal(container,'padding', 0, {sKey:'paddingStatus',fields:['padding']});
@@ -766,12 +759,7 @@ export default {
             };
           }),
         },
-      }).then((res) => {
-        if(res.is_refresh) {
-          this.p_getCartList()
-        }
-        this.$xdRoot.$emit("restFooterNumber");
-      });
+      }).then((res) => {});
     },
 
     //全选固定商铺

package/src/components/JfbMallCart/Mock.js

@@ -21,8 +21,7 @@ module.exports = {
         is_select: "N",
         promo_price: 1800,
         is_activity: 'Y',
-        tip: '',
-        source_from_tip: '产品来源：文字+背景测试新功能（商品V2） 专题'
+        tip: ''
       },
       {
         product_id: 60008817,
@@ -40,8 +39,7 @@ module.exports = {
         shop_name: "",
         is_select: "N",
         is_activity: 'Y',
-        tip: '已超活动限购数量，将按原价购买',
-        source_from_tip: '产品来源：文字+背景测试新功能（商品V2） 专题'
+        tip: '已超活动限购数量，将按原价购买'
       },
       {
         product_id: 60007091,
@@ -60,8 +58,7 @@ module.exports = {
         shop_name: "",
         is_select: "N",
         is_activity: 'Y',
-        tip: '已超活动限购数量，将按原价购买',
-        source_from_tip: '产品来源：文字+背景测试新功能（商品V2） 专题'
+        tip: '已超活动限购数量，将按原价购买'
       },
       {
         product_id: 60008820,

package/src/components/JfbMallCart/cusAttr/content.js

@@ -144,24 +144,6 @@ export default (data, gValue, gColor, oldData) => {
         ele:'xd-line',
         groupKey:'content'
       },
-      {
-        label: '订单来源',
-        ele: 'xd-cus-switch',
-        valueKey: 'showOrderSource',
-        value: dataVal({data, key:'showOrderSource', dValue:"N", gValue}),
-        className: 'input100',
-        groupKey:'content',
-        labelInline:true,
-        cusStyle:{marginBottom: '10px'},
-        setting: {
-          tips:['显示','不显示'],
-          isBackType: 'string'
-        },
-      },
-      {
-        ele:'xd-line',
-        groupKey:'content'
-      },
       {
         label: '随便逛逛',
         ele: 'xd-cus-switch',

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -54,11 +54,8 @@
                       <view style="display:flex;align-items:center">
                         <!-- <xd-unit :price="prod.sale_price" :isOld="false" color="#333" :iconSize="0.3" :fontSize="32"/> -->
                          <CusPrice :isPlus="is_plus_site" :type="order" :showPrice="prod.show_prices"></CusPrice>
-                         <view style="font-size: 28rpx;color:#999;margin-left: 16rpx;">{{prod['product_num'] ? 'x': ''}} {{prod['product_num']}}</view>
-                      </view>
-                      <view v-if="prod['paid_amount'] && prod['paid_amount'] > 0" class="coupon_paid">
-                        实付: <xd-unit :price="prod['paid_amount']" :isOld="false" color="#333" :iconSize="0.3" :fontSize="32"/>
                       </view>
+                      <view style="font-size: 28rpx;color:#999">{{prod['product_num'] ? 'x': ''}} {{prod['product_num']}}</view>
                     </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'"
@@ -972,7 +969,7 @@
         this.bottomPadding = gCPVal(container, 'bottomPadding', [16], {sKey: "bottomPaddingStatus", fields: ['bottomPadding']});
         this.bottomBtnRadius = gCPVal(container, 'bottomBtnRadius', [40], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomBtnHeight = gCPVal(container, 'bottomBtnHeight', [60], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
-        this.bottomPayText = gCPVal(container, 'bottomPayText', ["兑换"], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
+        this.bottomPayText = gCPVal(container, 'bottomPayText', ["支付"], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomPricePosition = gCPVal(container, 'bottomPricePosition', ['flex-start'], {sKey: "btnPriceStatus", fields: ['bottomPricePosition']});
 
         //优惠券样式升级为不在面板设置
@@ -1073,46 +1070,11 @@
         if(!this.canUseCoupon) return;
         this.showCouponChose = true;
       },
-      //选择完优惠券，需要在商品上展示实付款信息（商品价格-优惠券优惠价格）
-      handleCouponChoseResult(data){
-        //data.total_coupon_parts: [{"card_number":"10001000008865","part_id":"60031172_0_0","sale_amount":8000,"coupon_amount":5000,"coupon_split":"[{\"card_number\":\"10001000008865\",\"coupon_amount\":5000,\"coupon_point\":5000}]","coupon_point":5000}]
-        if(!data || !this.shopList) return;
-        // total_coupon_parts 为空字符串或空数组代表取消选择优惠券，清除已展示的实付金额
-        if(!data.total_coupon_parts || data.total_coupon_parts.length === 0){
-          this.shopList.forEach(shop => {
-            if(!shop.product) return;
-            shop.product.forEach(prod => {
-              delete prod.paid_amount;
-            });
-          });
-          return;
-        }
-        // 按 part_id 建立映射，快速查找
-        const couponMap = {};
-        data.total_coupon_parts.forEach(item => {
-          couponMap[item.part_id] = item;
-        });
-        // 遍历 shopList 下每个商品的 product，匹配 part_id 计算实付金额
-        this.shopList.forEach(shop => {
-          if(!shop.product) return;
-          shop.product.forEach(prod => {
-            const partId = prod.part_id;
-            const couponItem = couponMap[partId];
-            if(couponItem) {
-              // sale_price、coupon_point 均为分，实付金额 = 商品价格 x 数量 - 优惠券优惠价格
-              prod.paid_amount = (prod.sale_price || 0) * (prod.product_num || 1) - (couponItem.coupon_point || 0);
-            } else {
-              prod.paid_amount = (prod.sale_price || 0) * (prod.product_num || 1);
-            }
-          });
-        });
-      },
       //only选择满减券结果
       handleCouponChose(data){
         console.log(data,'alalalal')
         this.choseCoupon = data;
         this.showCouponChose = false;
-        this.handleCouponChoseResult(data);
         //共同使用模式：优惠券 + 积分 + 钱包可叠加
         //串行逻辑：先选积分 → 积分选完后检查 orderNeedPayPrice > 0 才选钱包
         if(this.is_wallet_use_with_coupon === "Y"){
@@ -1391,7 +1353,7 @@
         return new Promise((resolve, reject) => {
           this.$xdConfirm({
             title: '提示',
-            content: '您当前未使用票券，您将全部用微信兑换',
+            content: '您当前未使用票券，您将全部用微信支付',
             confirmText: '我知道了',
             width: '85%',
             isTitle: true,
@@ -1399,7 +1361,7 @@
               if (res.confirm) {
                 resolve();
               } else if (res.cancel) {
-                reject("取消兑换");
+                reject("取消支付");
               }
             }
           });
@@ -2074,12 +2036,6 @@
             align-items: flex-end;
             justify-content: space-between;
           }
-          .coupon_paid{
-            font-size: 28rpx;
-            color:#999;
-            display:flex;
-            align-items: center;
-          }
         }
         .postage_tip{
           color: rgb(229, 116, 112);

package/src/components/JfbMallConfirm/cusAttr/style.js

@@ -473,7 +473,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       value: dataVal({data, key:'bottomPayText', dValue: '', gValue}),
       hidden: !statusShow({data, key: 'btnStyleStatus', fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText'], gValue}),
       labelInline: true,
-      placeholder: '兑换按钮文字，默认“兑换”',
+      placeholder: '支付按钮文字，默认“支付”',
       className: 'input80',
     },
     {ele: "group_end"},

package/src/components/JfbMallConfirm/orderMixin.js

@@ -105,14 +105,12 @@ export default {
         this.showShopList = false;
         return;
       }
+
       jfbRootExec("getShopTakeTime", {
         vm: this,
         data: {
           resource_shop_id: shop.resource_shop_id,
-          shop_id: shop.shop_id,
-          cart_order_id: this.order_id,
-          address_nnid: this.curAddr ? this.curAddr.address_nnid : "",
-          delivery_method: curShop.deliveryPickValue
+          shop_id: shop.shop_id
         }
       }).then(res => {
         this.shopList = this.shopList.map((item, index) => {
@@ -452,7 +450,7 @@ export default {
           this.handleToPay(val);
         }else{
           this.$xdAlert({
-            content: '积分不足，请选择其他票券',
+            content: '余额不足，请选择其他票券',
             time: 3000,
             isClose: true,
             zIndex: 5000

package/src/components/JfbMallHomeProductList/JfbMallHomeProductList.vue

@@ -32,7 +32,6 @@
             v-if="navList.length"
             class="xd-tab"
             :height="110"
-            :nav-padding="navPadding"
             :key="tagNameKey"
             :line-bottom="lineBottom"
             :footer-style="titleFooterStyle"
@@ -239,7 +238,6 @@
         titleStyleDesc:{},
         navRadius:'0',
         titleTabShadow:'',
-        navPadding:{}, //导航内边界
 
 
         //特别推荐
@@ -331,8 +329,7 @@
           top: (this.layoutInfo.top - 2) + 'rpx',
           borderRadius: this.navRadius + 'rpx',
           overflow: 'hidden',
-          boxShadow:this.titleTabShadow,
-          padding: this.getMarginAndPadding(this.navPadding,0),
+          boxShadow:this.titleTabShadow
         }
       },
       listPaddingComp(){
@@ -490,7 +487,6 @@
         this.titleBgcColor = gCPVal(container,'titleBgcColor', '#fff', {sKey:'titleBgcColorStatus',fields:['titleBgcColor']});
         this.titleColor = gCPVal(container, 'titleColor', '#333');
         this.titleBorder = gCPVal(container, 'titleBorder', {});
-        this.navPadding = gCPVal(container,'navPadding', [0], {sKey:'navPaddingStatus',fields:['navPadding'],isPMR: true});
         //兼容老写法
         this.is_title_border = gCPVal(container, 'is_title_border', 'N');
         this.is_title_border_c = gCPVal(container, 'is_title_border_c', '#fff');
@@ -888,7 +884,6 @@
     right: 0;
     background: #fff;
     z-index: 10000;
-    border-radius: 0!important;
     &-height{
       height: unit(112, rpx);
     }

package/src/components/JfbMallHomeProductList/cusAttr/style.js

@@ -166,39 +166,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       size: 'small',
       groupKey:'style',
     },
-    {
-      label: '导航边距',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'navPaddingStatus',
-      value: statusDataVal({data, key: 'navPaddingStatus', fields:['navPadding'], gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-margin-padding',
-      groupKey:'style',
-      valueKey: 'navPadding',
-      value: dataVal({
-        data,
-        key:'navPadding',
-        dValue:0,
-        gValue,
-        isPM: true,
-      }),
-      hidden: !statusShow({data, key: 'navPaddingStatus', fields:['navPadding'], gValue}),
-      labelInline:true,
-      setting: {
-        type: 'margin',
-      },
-      inline: false,
-    },
-    {ele: 'group_end'},
+
     {
       label: '导航名称',
       ele: 'xd-radio',

package/src/components/JfbMallProductInfo/JfbMallProductInfo.vue

@@ -264,7 +264,7 @@
               width="220rpx" fontSize="28"
               @click="addCartAndBuy"
               :plain="btnStyle==='border'"
-            >立即兑换</xd-button>
+            >立即购买</xd-button>
             <view v-if="btnNoBuy" style="font-size:32rpx;color:#666666;">
               {{btnNoBuy.text}}
             </view>

package/src/components/JfbMallProductInfo/XdSku.vue

@@ -181,7 +181,7 @@
                 type="subPrimary"
                 size="small"
                 @click="onConfirm('buy')"
-                >立即兑换</xd-button
+                >立即购买</xd-button
               >
             </template>
           </view>

package/src/components/JfbMallProductInfo/XdSkuJd.vue

@@ -150,7 +150,7 @@
                 ]"
                 :bg-color="buyButtonStyle.buyBtnBgColor"
                 :radius="otherButtonStyle.bottomBtnRadius + 'rpx'"
-              type="subPrimary" style="width:250rpx;margin:0 20rpx" size="small" @click="onConfirm('buy')">立即兑换</xd-button>
+              type="subPrimary" style="width:250rpx;margin:0 20rpx" size="small" @click="onConfirm('buy')">立即购买</xd-button>
           </template>
           </view>
         </view>

package/src/components/JfbMallProductInfo/XdSkuNew.vue

@@ -140,7 +140,7 @@
             style="width: 250rpx;margin:0 20rpx"
             size="small"
             @click="onConfirm('buy')"
-            >立即兑换</xd-button
+            >立即购买</xd-button
           >
         </template>
       </view>

package/src/components/JfbMallProductInfo/cusAttr/style.js

@@ -839,7 +839,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     { ele: 'group_end' },
     {
-      label: '立即兑换',
+      label: '立即购买',
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'buyBtnStatus',

package/src/components/JfbMallProductInfoV2/JfbMallProductInfoV2.vue

@@ -105,7 +105,7 @@
             class="btn" type="subPrimary" size="small"
             width="200rpx" fontSize="28"
             @click="addCartAndBuy"
-          >立即兑换</xd-button>
+          >立即购买</xd-button>
           <view v-if="btnNoBuy" style="font-size:32rpx;color:#666666;">
             {{btnNoBuy.text}}
           </view>

package/src/components/JfbMallProductInfoV2/XdSku.vue

@@ -46,7 +46,7 @@
             <xd-button
               v-if="btnBuyNow"
               :disabled="!btnBuyNow.enabled"
-              type="subPrimary" style="width:250rpx" size="small" @click="onConfirm('buy')">立即兑换</xd-button>
+              type="subPrimary" style="width:250rpx" size="small" @click="onConfirm('buy')">立即购买</xd-button>
           </template>
         </view>
       </view>

package/src/components/JfbMallProductList/cusAttr/content.js

@@ -58,9 +58,78 @@ export default (data, gValue,gColor,oldData)=>{
 
   let categoryParentType = dataVal({data, key:'categoryParentType', dValue:'root', gValue});
 
-  let allItem = [];
-  if(data.category !== 'none') {
-    allItem = [
+
+  return[
+    {
+      ele: 'title',
+      label: '基础',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: "业务线",
+      ele: "xd-choose-namespace",
+      valueKey: "xnamespace",
+      groupKey:'content',
+      placeholder: '请选择业务线',
+      notice:'空继承上级业务线',
+      inline: false,
+      labelInline:true,
+      value:  dataVal({data, key:'xnamespace', dValue:null, gValue}),
+      className: 'input100',
+      handleCustom: (cb) => {
+        XdBus.getParentApi('getOptionsNamespaces')()
+          .then(res => {
+            cb(res.list)
+          })
+          .catch();
+      }
+    },
+    {
+      label: "商品排序",
+      ele: "xd-select-list",
+      valueKey: "sort",
+      labelInline: true,
+      value: dataVal({data, key:'sort', dValue:'default', gValue}),
+      groupKey:'content',
+      className: 'input100',
+      list: [
+        {label: "综合排序",notice:'默认排序，多维度综合计算后的排序', value: "default"},
+        {label: "销量由高到低", value: "sale_num_desc"},
+        {label: "价格由高到低", value: "price_desc"},
+        {label: "价格由低到高", value: "price_asc"},
+      ]
+    },
+    {
+      ele: 'title',
+      label: '组件布局',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: "分类布局",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "category",
+      value: category,
+      labelInline:true,
+      isTplRef:true,
+      className: 'input100',
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: '25g7ZD0RxIFu0oaAbPYQ5',
+          key: Date.now(),
+          filter: false
+        })
+          .then(res => {
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    data.category !== 'none' && [
       {ele: 'group_start'},
       {
         label: "全部名称",
@@ -168,81 +237,8 @@ export default (data, gValue,gColor,oldData)=>{
         ],
       },
       {ele: 'group_end'},
-    ]
-  }
-
-
-  return[
-    {
-      ele: 'title',
-      label: '基础',
-      size: 'small',
-      groupKey:'content',
-    },
-    {
-      label: "业务线",
-      ele: "xd-choose-namespace",
-      valueKey: "xnamespace",
-      groupKey:'content',
-      placeholder: '请选择业务线',
-      notice:'空继承上级业务线',
-      inline: false,
-      labelInline:true,
-      value:  dataVal({data, key:'xnamespace', dValue:null, gValue}),
-      className: 'input100',
-      handleCustom: (cb) => {
-        XdBus.getParentApi('getOptionsNamespaces')()
-          .then(res => {
-            cb(res.list)
-          })
-          .catch();
-      }
-    },
-    {
-      label: "商品排序",
-      ele: "xd-select-list",
-      valueKey: "sort",
-      labelInline: true,
-      value: dataVal({data, key:'sort', dValue:'default', gValue}),
-      groupKey:'content',
-      className: 'input100',
-      list: [
-        {label: "综合排序",notice:'默认排序，多维度综合计算后的排序', value: "default"},
-        {label: "销量由高到低", value: "sale_num_desc"},
-        {label: "价格由高到低", value: "price_desc"},
-        {label: "价格由低到高", value: "price_asc"},
-      ]
-    },
-    {
-      ele: 'title',
-      label: '组件布局',
-      size: 'small',
-      groupKey:'content',
-    },
-    {
-      label: "分类布局",
-      ele: "xd-style-image",
-      groupKey: 'content',
-      valueKey: "category",
-      value: category,
-      labelInline:true,
-      isTplRef:true,
-      className: 'input100',
-      handleCustom(cusRes) {
-        XdBus.getParentApi('getCompStylesOptions')({
-          layout_ids: '25g7ZD0RxIFu0oaAbPYQ5',
-          key: Date.now(),
-          filter: false
-        })
-          .then(res => {
-            cusRes.data.cb(res)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-    ...allItem,
+    ],
+    
     {
       label: "分类样式",
       ele: "xd-style-image",
@@ -270,19 +266,19 @@ export default (data, gValue,gColor,oldData)=>{
           });
       },
     },
-    // {ele: 'group_start'},
-    // 0&&{
-    //   label: '底部距离',
-    //   ele: 'el-input',
-    //   type: 'number',
-    //   labelInline: true,
-    //   valueKey: 'lineBottom',
-    //   value: dataVal({data, key:'lineBottom', dValue:'10', gValue}),
-    //   groupKey:'content',
-    //   className: 'input100',
-    //   hidden: !['v1','v5'].includes(category) || ['desc','none','center','triangle'].includes(data['navStyle']),
-    // },
-    // {ele: 'group_end'},
+    {ele: 'group_start'},
+    0&&{
+      label: '底部距离',
+      ele: 'el-input',
+      type: 'number',
+      labelInline: true,
+      valueKey: 'lineBottom',
+      value: dataVal({data, key:'lineBottom', dValue:'10', gValue}),
+      groupKey:'content',
+      className: 'input100',
+      hidden: !['v1','v5'].includes(category) || ['desc','none','center','triangle'].includes(data['navStyle']),
+    },
+    {ele: 'group_end'},
     {
       label: "商品布局",
       ele: "xd-style-image",