Merge branch 'dev-sws' into dev-yxl

App.vue

@@ -7,12 +7,12 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                request_url: 'http://shopxo.com/',
-                // request_url:'https://new.shopxo.vip/',
+                // request_url: 'http://shopxo.com/',
+                request_url:'https://new.shopxo.vip/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url: 'http://shopxo.com/',
-                // static_url:'https://new.shopxo.vip/',
+                // static_url: 'http://shopxo.com/',
+                static_url:'https://new.shopxo.vip/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',

components/diy/diy.vue

@@ -2,7 +2,7 @@
     <scroll-view :scroll-y="true" class="ht" @scroll="on_scroll_event">
         <!-- 头部小程序兼容 -->
         <view class="pr header">
-            <componentDiyHeader v-if="hack_reset" :propValue="header_data.com_data" :propScrollTop="scroll_top" @immersion-model-call-back="immersion_model_call_back"></componentDiyHeader>
+            <componentDiyHeader :propkey="header_data.id" :propValue="header_data.com_data" :propScrollTop="scroll_top" @immersion-model-call-back="immersion_model_call_back"></componentDiyHeader>
         </view>
         <view class="content flex-col" :style="'padding-top:' + (temp_is_header_top ? temp_header_top : '0')">
             <view v-for="item in tabs_data" :key="item.key">
@@ -74,7 +74,7 @@
 
         <!-- 当前diy页面底部菜单（非公共底部菜单） -->
         <block v-if="is_show_footer == 1">
-            <componentDiyFooter v-if="hack_reset" :propValue="footer_data.com_data" @footer-height="footer_height_value_event"></componentDiyFooter>
+            <componentDiyFooter :propkey="footer_data.id" :propValue="footer_data.com_data" @footer-height="footer_height_value_event"></componentDiyFooter>
             <view v-if="footer_height_value > 0" :style="'height:' + footer_height_value + 'rpx;'"></view>
         </block>
 
@@ -224,8 +224,6 @@
                 data_is_loading: 0,
                 // 缓存key
                 cache_key: app.globalData.data.cache_diy_data_key,
-                // 重置
-                hack_reset: false,
                 // 底部导航高度
                 footer_height_value: 0,
                 // 商品ref索引
@@ -268,7 +266,6 @@
             init() {
                 // tabs选项卡数据过滤
                 this.setData({
-                    hack_reset: false,
                     header_data: this.propValue.header,
                     footer_data: this.propValue.footer,
                     diy_data: this.propValue.diy_data,
@@ -278,11 +275,6 @@
                     temp_sticky_top: this.sticky_top,
                     temp_header_top: this.header_top,
                 });
-                this.$nextTick(() => {
-                    this.setData({
-                        hack_reset: true,
-                    });
-                });
                 uni.setStorageSync(this.cache_key + this.tabs_home_id, this.propValue.diy_data);
             },
             // 顶部导航沉浸模式回调

components/diy/header.vue

@@ -35,7 +35,7 @@
                                             </view>
                                         </template>
                                     </view>
-                                    <view v-if="!isEmpty(form.content.icon_setting)" class="flex-row align-c padding-right-main" :class="['1'].includes(form.content.theme) ? 'right-0' : ''" :style="{ gap: form.style.img_space * 2 + 'rpx' }">
+                                    <view v-if="!isEmpty(form.content.icon_setting)" class="flex-row align-c padding-right-main z-i" :class="['1'].includes(form.content.theme) ? 'right-0' : ''" :style="{ gap: form.style.img_space * 2 + 'rpx' }">
                                         <view v-for="(item, index) in form.content.icon_setting" :key="index" :style="{ width: form.style.img_size * 2 + 'rpx', height: form.style.img_size * 2 + 'rpx' }" :data-value="item.link.page" @tap="url_event">
                                             <imageEmpty v-if="item.img.length > 0" :propImageSrc="item.img[0].url" :propErrorStyle="'width: ' + Number(form.style.img_size) * 2 + 'rpx;height:' + Number(form.style.img_size) * 2 + 'rpx;'"></imageEmpty>
                                             <iconfont v-else :name="'icon-' + item.icon" :size="form.style.img_size * 2 + 'rpx'" color="#666"></iconfont>

components/diy/modules/image-empty.vue

@@ -37,6 +37,11 @@
                 defaultImage: '/static/images/common/image-empty.png',
             };
         },
+        watch: {
+            propImageSrc(val) {
+                this.init();
+            },
+        },
         mounted() {
             this.init();
         },

components/diy/notice.vue

@@ -8,7 +8,7 @@
                         <iconfont :name="form_content.icon_class" :size="form_style.icon_size * 2 + 'rpx'" :color="form_style.icon_color"></iconfont>
                     </view>
                     <view v-else>
-                        <image :src="form_content.img_src[0].url" class="border-radius-sm dis-block" mode="aspectFill" :style="img_style"></image>
+                        <image v-if="form_content.img_src.length > 0" :src="form_content.img_src[0].url" class="border-radius-sm dis-block" mode="aspectFill" :style="img_style"></image>
                     </view>
                 </template>
                 <template v-else>
@@ -32,7 +32,7 @@
                             <iconfont :name="form_content.icon_class" :size="form_style.icon_size * 2 + 'rpx'" :color="form_style.icon_color"></iconfont>
                         </template>
                         <template v-else>
-                            <image :src="form_content.img_src[0].url" class="border-radius-sm dis-block" mode="aspectFill" :style="img_style"></image>
+                            <image v-if="form_content.img_src.length > 0" :src="form_content.img_src[0].url" class="border-radius-sm dis-block" mode="aspectFill" :style="img_style"></image>
                         </template>
                     </template>
                     <template v-else>
@@ -66,7 +66,7 @@
             propkey: {
                 type: String,
                 default: '',
-            }
+            },
         },
         data() {
             return {
@@ -102,7 +102,7 @@
             propkey(val) {
                 // 初始化
                 this.init();
-            }
+            },
         },
         created() {
             this.init();

static/icon/iconfont.css

@@ -3,7 +3,7 @@
     /* Project id 4227145 */
     /* 全局注册需要切换成绝对路径 */
     /* @/static/icon/ */
-    src: url('@/static/icon/iconfont.ttf?t=1693280977762') format('truetype');
+    src: url('iconfont.ttf?t=1728461619582') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +14,334 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-left:before {
+  content: "\e755";
+}
+
+.icon-reset:before {
+  content: "\e756";
+}
+
+.icon-radius-l-t:before {
+  content: "\e757";
+}
+
+.icon-right:before {
+  content: "\e754";
+}
+
+.icon-radius-r-b:before {
+  content: "\e758";
+}
+
+.icon-arrow-bottom1:before {
+  content: "\e759";
+}
+
+.icon-elliptic:before {
+  content: "\e75a";
+}
+
+.icon-out-t:before {
+  content: "\e75b";
+}
+
+.icon-enter-r:before {
+  content: "\e75c";
+}
+
+.icon-single-sheet:before {
+  content: "\e752";
+}
+
+.icon-spread-over:before {
+  content: "\e753";
+}
+
+.icon-enter-l:before {
+  content: "\e75d";
+}
+
+.icon-round-dot:before {
+  content: "\e75e";
+}
+
+.icon-enter-b:before {
+  content: "\e75f";
+}
+
+.icon-search:before {
+  content: "\e760";
+}
+
+.icon-tile:before {
+  content: "\e761";
+}
+
+.icon-center:before {
+  content: "\e762";
+}
+
+.icon-enter-t:before {
+  content: "\e763";
+}
+
+.icon-close:before {
+  content: "\e764";
+}
+
+.icon-edit:before {
+  content: "\e765";
+}
+
+.icon-text:before {
+  content: "\e766";
+}
+
+.icon-auxiliary-line:before {
+  content: "\e767";
+}
+
+.icon-img:before {
+  content: "\e768";
+}
+
+.icon-out-l:before {
+  content: "\e769";
+}
+
+.icon-out-b:before {
+  content: "\e76a";
+}
+
+.icon-del:before {
+  content: "\e76b";
+}
+
+.icon-drag:before {
+  content: "\e76c";
+}
+
+.icon-out-r:before {
+  content: "\e76d";
+}
+
+.icon-line-point:before {
+  content: "\e76e";
+}
+
+.icon-del-o:before {
+  content: "\e76f";
+}
+
+.icon-copy1:before {
+  content: "\e770";
+}
+
+.icon-line:before {
+  content: "\e772";
+}
+
+.icon-close-o1:before {
+  content: "\e773";
+}
+
+.icon-radius-r-t:before {
+  content: "\e774";
+}
+
+.icon-radius-l-b:before {
+  content: "\e775";
+}
+
+.icon-arrow-top1:before {
+  content: "\e738";
+}
+
+.icon-arrow-left1:before {
+  content: "\e73f";
+}
+
+.icon-arrow-right1:before {
+  content: "\e737";
+}
+
+.icon-add:before {
+  content: "\e720";
+}
+
+.icon-eye-close:before {
+  content: "\e776";
+}
+
+.icon-eye:before {
+  content: "\e777";
+}
+
+.icon-true-o:before {
+  content: "\e77a";
+}
+
+.icon-error-img:before {
+  content: "\e77b";
+}
+
+.icon-folder:before {
+  content: "\e77c";
+}
+
+.icon-file:before {
+  content: "\e77d";
+}
+
+.icon-vf:before {
+  content: "\e77e";
+}
+
+.icon-video:before {
+  content: "\e77f";
+}
+
+.icon-zip:before {
+  content: "\e780";
+}
+
+.icon-ipa:before {
+  content: "\e781";
+}
+
+.icon-excel:before {
+  content: "\e782";
+}
+
+.icon-vsd:before {
+  content: "\e783";
+}
+
+.icon-apk:before {
+  content: "\e784";
+}
+
+.icon-word:before {
+  content: "\e785";
+}
+
+.icon-pdf:before {
+  content: "\e787";
+}
+
+.icon-ppt:before {
+  content: "\e788";
+}
+
+.icon-cart:before {
+  content: "\e791";
+}
+
+.icon-true:before {
+  content: "\e741";
+}
+
+.icon-upload:before {
+  content: "\e72b";
+}
+
+.icon-shu2:before {
+  content: "\e786";
+}
+
+.icon-heng2:before {
+  content: "\e789";
+}
+
+.icon-a-4x4:before {
+  content: "\e78a";
+}
+
+.icon-zuo1you2:before {
+  content: "\e78b";
+}
+
+.icon-shu3:before {
+  content: "\e78c";
+}
+
+.icon-shang2xia1:before {
+  content: "\e78d";
+}
+
+.icon-zuo1youshang1youxia2:before {
+  content: "\e78e";
+}
+
+.icon-shang1xia2:before {
+  content: "\e78f";
+}
+
+.icon-tianzige:before {
+  content: "\e790";
+}
+
+.icon-shang2xia3:before {
+  content: "\e792";
+}
+
+.icon-zuo2you1:before {
+  content: "\e793";
+}
+
+.icon-a-1ge:before {
+  content: "\e794";
+}
+
+.icon-EXE:before {
+  content: "\e795";
+}
+
+.icon-txt:before {
+  content: "\e796";
+}
+
+.icon-arrow-right-dbl:before {
+  content: "\e7b6";
+}
+
+.icon-tips:before {
+  content: "\e74a";
+}
+
+.icon-commodity-edit:before {
+  content: "\e797";
+}
+
+.icon-ellipsis:before {
+  content: "\e635";
+}
+
+.icon-arrow-right-o:before {
+  content: "\e799";
+}
+
+.icon-close-b:before {
+  content: "\e745";
+}
+
+.icon-a-miaosha:before {
+  content: "\e79a";
+}
+
+.icon-jinzhi:before {
+  content: "\e79c";
+}
+
+.icon-tubiao:before {
+  content: "\e79d";
+}
+
+.icon-mianxingtubiao_baojieguanli:before {
+  content: "\e64d";
+}
+
 .icon-bofang:before {
   content: "\e798";
 }
@@ -318,7 +646,7 @@
   content: "\e6b8";
 }
 
-.icon-fenlei-more:before {
+.icon-categroy-more:before {
   content: "\e6b7";
 }