update 花店样式等

xuxueyang

2024-08-09 fb14fa911bde1ed360fe89a1c41d74b158db9ab5

update 花店样式等

 components/common-address-select/common-address-select.vue

@@ -1,115 +1,122 @@
<template>
  <!-- 改动的默认地址通过全局变量来控制吧 -->
  <view class="flex location-select" @click="goToAddress">
    <uni-icons type="location" size="24" style="padding-top: 16rpx;margin-right: 8rpx;"></uni-icons>
    <view class="info">
      <view class="name" v-if="!address.id">请前往设置地址信息</span>
      </view>
      <view class="name">{{ address.name || '-' }}<span class="tel">{{ address.tel || '-' }}</span>
      </view>
      <view class="address">{{ address.schoolAreaStr || '' }} {{ address.blockStr || '' }} {{ address.room || '' }}
        {{ address.address || '' }}
      </view>
    </view>
    <view class="right-icon" style="padding-top: 16rpx;">
      <uni-icons type="right" size="18" color="#B3B3B3"></uni-icons>
    </view>
    <!-- 改动的默认地址通过全局变量来控制吧 -->
    <view class="flex location-select" @click="goToAddress">
        <uni-icons type="location" size="24" style="padding-top: 16rpx;margin-right: 8rpx;"></uni-icons>
        <view class="info">
            <view class="name" v-if="!address.id">请前往设置地址信息</span>
            </view>
            <view class="name">{{ address.name || '-' }}<span class="tel">{{ address.tel || '-' }}</span>
            </view>
            <view class="address">
                {{ address['province'] || '' }}{{ address['city'] && ('/' + address['city']) || '' }}{{
        address['region'] && ('/' + address['region']) || ''
      }}
                {{ address.address || '' }}
            </view>
        </view>
        <view class="right-icon" style="padding-top: 16rpx;">
            <uni-icons type="right" size="18" color="#B3B3B3"></uni-icons>
        </view>


  </view>
    </view>
</template>

<script>
import {
  mapState
} from 'vuex'
    import {
        mapState
    } from 'vuex'

export default {
  computed: {
    ...mapState({
      address: state => {
        return state.defaultaddress || {}
      },
      currentInfo: state => {
        return state.currentInfo || {}
      },
    }),
  },
  name: "common-address-select",
  data() {
    return {};
  },
  async mounted() {
    await this.init()
  },
  methods: {
    async init() {
      //获取默认地址并且填充
      if (!this.address.id && this.currentInfo.id) {
        this.$message.showLoading()
        const {data} = await this.$http.request('get', '/api/address/default/detail')
        this.$message.hideLoading()
        if (data) {
          //提交更新默认地址
          this.$store.commit('setDefaultAddress', {...data})
        }
      }
    export default {
        computed: {
            ...mapState({
                address: state => {
                    return state.defaultaddress || {}
                },
                currentInfo: state => {
                    return state.currentInfo || {}
                },
            }),
        },
        name: "common-address-select",
        data() {
            return {};
        },
        async mounted() {
            await this.init()
        },
        methods: {
            async init() {
                //获取默认地址并且填充
                if (!this.address.id && this.currentInfo.id) {
                    this.$message.showLoading()
                    const {
                        data
                    } = await this.$http.request('get', '/api/address/default/detail')
                    this.$message.hideLoading()
                    if (data) {
                        //提交更新默认地址
                        this.$store.commit('setDefaultAddress', {
                            ...data
                        })
                    }
                }

    },
    goToAddress() {
      if (!this.currentInfo.id) {
        this.$message.showToast('请先前往登录')
        return
      }
      uni.navigateTo({
        url: '/pages/user/address/address?source=select'
      })
    }
  },
  props: {
    // address:{
    //     type:Object,
    //     default(){
    //         return {}
    //     }
    // }
  }
}
            },
            goToAddress() {
                if (!this.currentInfo.id) {
                    this.$message.showToast('请先前往登录')
                    return
                }
                uni.navigateTo({
                    url: '/pages/user/address/address?source=select'
                })
            }
        },
        props: {
            // address:{
            //     type:Object,
            //     default(){
            //         return {}
            //     }
            // }
        }
    }
</script>

<style lang="scss">
    .location-select {
        .info {

.location-select {
  .info {
    // margin-bottom: 16rpx;
    .name {
      font-weight: 400;
      font-size: 32rpx;
      color: #000000;
      margin-left: 6rpx;
            // margin-bottom: 16rpx;
            .name {
                font-weight: 400;
                font-size: 32rpx;
                color: #000000;
                margin-left: 6rpx;

      .tel {
        margin-left: 6rpx;
        font-size: 28rpx;
        color: #666666;
      }
    }
                .tel {
                    margin-left: 6rpx;
                    font-size: 28rpx;
                    color: #666666;
                }
            }

    .address {
      font-size: 24rpx;
      color: #666666;
      line-height: 28rpx;
      margin-top: 6rpx;
      max-width: 580rpx;
      margin-left: 6rpx;
      word-wrap: break-word;
    }
            .address {
                font-size: 24rpx;
                color: #666666;
                line-height: 28rpx;
                margin-top: 6rpx;
                max-width: 580rpx;
                margin-left: 6rpx;
                word-wrap: break-word;
            }

  }
        }

  .right-icon {
    margin-left: auto;
    margin-right: 0rpx;
  }
}
        .right-icon {
            margin-left: auto;
            margin-right: 0rpx;
        }
    }
</style>

 manifest.json

@@ -49,7 +49,7 @@
    "quickapp" : {},
    /* 快应用特有相关 */
    "mp-weixin" : {
        "appid" : "wx3203fd935a6ffe09",
        "appid" : "wx6d0ecc4e18710458",
        "setting" : {
            "urlCheck" : false,
            "es6" : true,

 pages/home/components/home-top-flow.vue

@@ -11,7 +11,7 @@

            <view class="m-l-12 info-container flex1">
                <view class="title">
                    {{ item.name || '-' }}
                    {{ item.name || '-' }}<span v-if="item.categoryStr" class="m-l-10">{{item.categoryStr || '-'}}</span>
                    <view class="price">
                        ￥{{ item.price || 0 }}/扎
                    </view>

 pages/user/supplier-user.vue

@@ -386,7 +386,8 @@
            }

        },

        // #endif

        onShow() {

        onShow() {
            this.cacheUserId = ''

            this.getTj()

        },

        onLoad(options) {


 sub_pages/partner/markup-config/markup-config.vue

@@ -22,7 +22,7 @@
                    <view class="title">

                        商品名称：{{ item.name || '-' }}

                    </view>

                    <u-divider></u-divider>

                    <u-divider style="margin-top: 20rpx;padding-top: 20rpx;"></u-divider>

                    <view class="form">

                        <view class="flex">
                            <view class="form-item">
@@ -212,8 +212,8 @@
                }



                .form {

                    display: flex;

                    flex-wrap: wrap;

                    // display: flex;

                    // flex-wrap: wrap;



                    .form-item {

                        height: 40rpx;

@@ -221,8 +221,8 @@
                        // padding-top: 4rpx;

                        padding-bottom: 0rpx;

                        border-bottom: none;

                        // min-width: 35%;

                        // max-width: 50%;
                        min-width: unset;

                        max-width: unset;
                        display: flex;

                        flex: 1;