xuxueyang
2024-09-11 af773c6b3e85cf3e7628eefe6f287c44a8d5a11a
update 合并v2版本的宏定义
已修改9个文件
61 ■■■■ 文件已修改
package.json 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/user/supplier-user.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/self/collect.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/self/history.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/shop/shop.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/shopping/confirm.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/trade/detail.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/trade/list.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/trade/trade.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
package.json
@@ -42,8 +42,7 @@
                    "PUB_TYPE": "customer"
                },
                "define": {
                    "PUB_CUSTOMER": true,
                    "PUB_CUSTOMER_DEV": true
                    "PUB_CUSTOMER": true
                }
            }
pages/user/supplier-user.vue
@@ -40,7 +40,7 @@
                        <span v-if="currentInfo.partnerDTO&&currentInfo.partnerDTO.status!=='P'">
                            ({{ currentInfo.partnerDTO ? currentInfo.partnerDTO.statusStr : '' }})</span>
                        <!-- #ifdef PUB_CUSTOMER_DEV -->
                        <!-- #ifdef PUB_CUSTOMER -->
                        <span class="member-level" @click="goto('/sub_pages/customer/self/member-center',true)"
                            v-if="currentInfo&&currentInfo.customerDTO&&currentInfo.customerDTO.userGrowthRecord">
                            <view v-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='普通会员'" class="v1">
@@ -108,7 +108,7 @@
        </view>
        <!-- #ifdef PUB_CUSTOMER_DEV -->
        <!-- #ifdef PUB_CUSTOMER -->
        <view class="m-20 coupon-info-container" @click="goto( `/sub_pages/customer/coupon/good-all`,true)"
            v-if="selftype==='customer'||!selftype">
            <view>
@@ -219,7 +219,7 @@
                        </image>
                        <view>投诉反馈</view>
                    </view>
                    <!-- #ifdef PUB_CUSTOMER_DEV -->
                    <!-- #ifdef PUB_CUSTOMER -->
                    <view class="service-icons" @click="goto('/sub_pages/customer/coupon/coupon-self',true)">
                        <image src="../../static/images/customer/service/service-icon-8.png" class="t2 service-icon ">
                        </image>
@@ -232,7 +232,7 @@
                        <view>兑换券</view>
                    </view>
                    <!-- #endif -->
                    <!-- #ifndef PUB_CUSTOMER_DEV -->
                    <!-- #ifndef PUB_CUSTOMER -->
                    <view class="service-icons">
                    </view>
sub_pages/customer/self/collect.vue
@@ -246,19 +246,12 @@
                            {{ dto.name || '-' }}
                        </view>
                        
                        <!-- #ifdef PUB_CUSTOMER_DEV -->
                        <view class="price m-l-a m-r-0 component-price-new">
                            <span class="tip">会员价</span>¥<span class="p">{{ dto.priceMember || dto.price || '-' }}</span>/扎
                            <view class="component-price-old">
                                ¥{{dto.price}}/扎
                            </view>
                        </view>
                        <!-- #endif -->
                        <!-- #ifndef PUB_CUSTOMER_DEV -->
                        <view class="price m-l-a m-r-0">
                            ¥{{ dto.price || '-' }}/扎
                        </view>
                        <!-- #endif -->
                    </view>
                    <view class="flex">
                        <view class="desc p-t-12 flex" @click.stop="toDetail(dto)">
sub_pages/customer/self/history.vue
@@ -234,19 +234,13 @@
                            {{ dto.name || '-' }}
                        </view>
                        
                        <!-- #ifdef PUB_CUSTOMER_DEV -->
                        <view class="price m-l-a m-r-0 component-price-new">
                            <span class="tip">会员价</span>¥<span class="p">{{ dto.priceMember || dto.price || '-' }}</span>/扎
                            <view class="component-price-old">
                                ¥{{dto.price}}/扎
                            </view>
                        </view>
                        <!-- #endif -->
                        <!-- #ifndef PUB_CUSTOMER_DEV -->
                        <view class="price m-l-a m-r-0">
                            ¥{{ dto.price || '-' }}/扎
                        </view>
                        <!-- #endif -->
                    </view>
                    <view class="flex">
                        <view class="desc p-t-12 flex" @click.stop="toDetail(dto)">
sub_pages/customer/shop/shop.vue
@@ -105,19 +105,12 @@
                            <view class="m-l-12 info-container flex1">
                                <view class="title" @click.stop="toDetail(item)">
                                    {{item.name}}
                                    <!-- #ifdef PUB_CUSTOMER_DEV -->
                                    <view class="price component-price-new">
                                        <span class="tip">会员价</span>¥<span class="p">{{item.priceMember||item.price}}</span>/扎
                                        <view class="component-price-old">
                                            ¥{{item.price}}/扎
                                        </view>
                                    </view>
                                    <!-- #endif -->
                                    <!-- #ifndef PUB_CUSTOMER_DEV -->
                                    <view class="price">
                                        ¥{{item.price}}/扎
                                    </view>
                                    <!-- #endif -->
                                </view>
                                <view class="tags" v-if="item.tags||false" @click.stop="toDetail(item)">
sub_pages/customer/shopping/confirm.vue
@@ -407,7 +407,6 @@
            </view>
            <view class="p10 bg-white m-t-20 br-4">
                <!-- #ifdef PUB_CUSTOMER_DEV -->
                <view class="form-item  flex ">
                    <view class="label">优惠券</view>
@@ -417,7 +416,6 @@
                        <u-icon class="m-l-a" name="arrow-right"></u-icon>
                    </view>
                </view>
                <!-- #endif -->
                <view class="form-item  flex m-t-12">
                    <view class="label">特殊需求</view>
@@ -439,7 +437,6 @@
                        </view>
                    </view>
                </view>
                <!-- #ifdef PUB_CUSTOMER_DEV -->
                <view class="form-item  flex ">
                    <view class="label">兑换券</view>
@@ -450,7 +447,6 @@
                        <u-icon class="m-l-a" name="arrow-right"></u-icon>
                    </view>
                </view>
                <!-- #endif -->
            </view>
        </view>
sub_pages/customer/trade/detail.vue
@@ -72,7 +72,6 @@
                <view class=" ">{{ dto.unit || '-' }}</view>
            </view>
            <view class="flex m-t-12">
                <!-- #ifdef PUB_CUSTOMER_DEV -->
                <view>
                    <view class="price m-r-a component-price-new">
                        <span class="tip">会员价</span><span class="num p">{{ dto.priceMember || dto.price || '-' }}</span>
@@ -83,13 +82,8 @@
                        元/扎
                    </view>
                </view>
                <!-- #endif -->
                <!-- #ifndef PUB_CUSTOMER_DEV -->
                <view class="price m-r-a">
                    <span class="num">{{ dto.price || '-' }}</span>
                    元/扎
                </view>
                <!-- #endif -->
                
                
                <view class="m-l-a m-r-15">
sub_pages/customer/trade/list.vue
@@ -74,19 +74,13 @@
                        <view class="title">
                            {{item.name||'-'}}
                            
                            <!-- #ifdef PUB_CUSTOMER_DEV -->
                            <view class="price component-price-new">
                                <span class="tip">会员价</span>¥<span class="p">{{item.priceMember||item.price}}</span>/扎
                                <view class="component-price-old">
                                    ¥{{item.price}}/扎
                                </view>
                            </view>
                            <!-- #endif -->
                            <!-- #ifndef PUB_CUSTOMER_DEV -->
                            <view class="price">
                                ¥{{item.price||0}}元/扎
                            </view>
                            <!-- #endif -->
                            
                        </view>
                        <view class="tags" v-if="item.tags">
sub_pages/customer/trade/trade.vue
@@ -55,7 +55,6 @@
                            </view>
                            <view class="cateen_infos list">
                                <view class="title">{{item.name}}</view>
                                <!-- #ifdef PUB_CUSTOMER_DEV -->
                                
                                <view class="price">
                                    <view>会员价</view>
@@ -63,10 +62,7 @@
                                </view>                                
                                <view class="price component-price-old">¥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
                                
                                <!-- #endif -->
                                <!-- #ifndef PUB_CUSTOMER_DEV -->
                                <view class="price">¥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
                                <!-- #endif -->
                                <view class="desc">在售 {{item.stock||'0'}} 扎</view>
                            </view>