xuxueyang
2024-09-14 c2910d258fd92ff40a6d23d94c186f11d78a5fd5
update 花店端一些细节
已修改5个文件
81 ■■■■ 文件已修改
pages/user/supplier-user.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/coupon/good-all.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/coupon/good-self.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/coupon/point-history.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/shopping/confirm.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/user/supplier-user.vue
@@ -50,20 +50,22 @@
                                <uni-icons color="#7CC662" type="right" size="18"></uni-icons>
                            </view>
                            <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='银卡会员'" class="v2">
                            <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='银卡会员'"
                                class="v2">
                                <image class="member-icon v2"
                                    src="../../static/images/customer/coupon/member/icon-member-2.png"></image>
                                {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
                                <uni-icons color="#7498E0" type="right" size="18"></uni-icons>
                            </view>
                            <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='金卡会员'" class="v3">
                            <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='金卡会员'"
                                class="v3">
                                <image class="member-icon v3"
                                    src="../../static/images/customer/coupon/member/icon-member-3.png"></image>
                                {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
                                <uni-icons color="#C47810" type="right" size="18"></uni-icons>
                            </view>
                            <view v-else  class="v4">
                            <view v-else class="v4">
                                <image class="member-icon v4"
                                    src="../../static/images/customer/coupon/member/icon-member-4.png"></image>
                                {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
@@ -113,7 +115,7 @@
            v-if="selftype==='customer'||!selftype">
            <view>
                <view class="title">积分商城</view>
                <view class="score m-t-8">拥有积分:{{currentInfo.currentPoint || 0}}</view>
                <view class="score m-t-8">拥有积分:{{self_point}}</view>
            </view>
            <view class="button m-l-a m-r-0 m-t-12">
                去兑换 <uni-icons color="#ffffff" type="right" size="16"></uni-icons>
@@ -431,6 +433,20 @@
<script>
    export default {
        computed: {
            self_point() {
                if (this.currentInfo.currentPoint) {
                    if (this.currentInfo.currentPoint >= 10000) {
                        return (this.currentInfo.currentPoint / 10000 + '万')
                    } else {
                        return this.currentInfo.currentPoint
                    }
                }
                return 0
            }
        },
        data() {
            return {
                CustomBar: uni.getStorageSync('CustomBar'),
@@ -512,6 +528,7 @@
        created() {
        },
        async onPullDownRefresh() {
            await this.$store.dispatch('getCurrentInfo')
            uni.stopPullDownRefresh()
sub_pages/customer/coupon/good-all.vue
@@ -16,7 +16,7 @@
                    <view class="flex" @click="goto('/sub_pages/customer/coupon/point-history',true)">
                        <image src="../../../static/images/customer/coupon/icon-point.png" class="point-icon">
                        </image>
                        {{currentInfo.currentPoint || 0}}
                        {{self_point}}
                        <uni-icons class="icon" type="right" size="32"></uni-icons>
                    </view>
                </view>
@@ -100,6 +100,20 @@
<script>
    export default {
        computed: {
            self_point() {
                if (this.currentInfo.currentPoint) {
                    if (this.currentInfo.currentPoint >= 10000) {
                        return (this.currentInfo.currentPoint / 10000 + '万')
                    } else {
                        return this.currentInfo.currentPoint
                    }
                }
                return 0
            }
        },
        methods: {
            changeTab(flg) {
                this.flg = '' + flg
sub_pages/customer/coupon/good-self.vue
@@ -10,24 +10,28 @@
        <view class="p10">
            <view v-for="(item,index) of list" :key="index" class="good-item" :class="[query.status]">
                <view class="flex container img100" @click="selectItem(item)">
                <view class="flex container img100 flex-wrap-normal" @click="selectItem(item)">
                    <view class="info-price">
                        <image :lazy-load="true" :src="item.cover" class="cover" mode="scaleToFill"></image>
                    </view>
                    <view class="info flex1">
                        <view class="title flex">
                            {{item.name||''}}
                    <view class="info flex1 ">
                        <view class="title flex description">
                            <view style="max-width: 420rpx;word-break: break-all;" class="word-e" >{{item.name||''}}</view>
                            <!-- <radio :checked="isIngood(item)" @click.stop="updateSelectGood(item)" v-if="source==='shopping'" class="select-coupon"></radio> -->
                            <view :style="{ 'margin-right': '20rpx'}" class="component-radio m-l-a"
                            <view :style="{ 'margin-right': '20rpx'}" class="component-radio m-l-a "
                                :class="[isIngood(item)?'cur':'']" v-if="source==='shopping'">
                            </view>
                        </view>
                        <view class="time word-e">
                        <view class="time word-e" style="word-break: break-all;max-width: 360rpx;">
                            {{item.description||''}}
                        </view>
                        <view class="time word-e" style="font-size: 22rpx;" v-if="item.expireTime">
                            截止:{{item.expireTime||'-'}}
                        </view>
                        <view class="button m-l-a m-r-10" v-if="source!=='shopping'">
                            查看详情
                        </view>
@@ -201,8 +205,8 @@
                .info-price {
                    .cover {
                        width: 150rpx;
                        height: 150rpx;
                        width: 160rpx;
                        height: 160rpx;
                    }
                }
@@ -212,12 +216,12 @@
                    .title {
                        font-weight: 600;
                        font-size: 36rpx;
                        font-size: 32rpx;
                        color: #333333;
                        line-height: 50rpx;
                        line-height: 40rpx;
                        text-align: left;
                        position: relative;
                        margin-top: 20rpx;
                        margin-top: 10rpx;
                        .select-coupon {
                            position: absolute;
sub_pages/customer/coupon/point-history.vue
@@ -1,6 +1,12 @@
<template>
    <!-- 列表页面 -->
    <view>
        <view class="m-t-12 m-b-12 flex">
            <!-- v-if="!selecttoday" -->
            <view class="m-l-a m-r-20 w-fit" :class="[query.date?'':'desc-gray']" @click="show_time_picker_time=true">
                {{query.date || '请选择日期'}}
            </view>
        </view>
        <view class="p15" style="min-height: calc(100vh - 260rpx);">
            <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
            <view v-for="(item,index) in list" :key="index" class="m-b-24">
@@ -16,8 +22,8 @@
                        <view class="form-item-value">{{item.point || ''}}</view>
                    </view>
                    <view class="form-item">
                        <view class="form-item-label">备注</view>
                        <view class="form-item-value">{{item.remarks || ''}}</view>
                        <view class="form-item-label" style="min-width: 80rpx;">备注</view>
                        <view class="form-item-value" style="word-break: break-word;">{{item.remarks || ''}}</view>
                    </view>
                </view>
            </view>
sub_pages/customer/shopping/confirm.vue
@@ -476,10 +476,10 @@
                    <view class="m-l-a m-r-0 flex" style="word-break: break-all;"
                        :class="[!dto.goodsRecordIdList||dto.goodsRecordIdList.length==0?'desc-gray':'']"
                        @click="toSelectGood">
                        <view> {{dto.goodsRecordIdListStr|| '请选择'}}
                        <view class="word-e" style="max-width: 400rpx;"> {{dto.goodsRecordIdListStr|| '请选择'}}
                        </view>
                        <!-- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view> -->
                        <view style="min-width: 60rpx;">
                        <view class="m-t-4">
                            <u-icon class="m-l-a" name="arrow-right"></u-icon>
                        </view>
                    </view>