fix bug 接口对接和样式调整

xuxueyang

2024-07-26 8c9fe474d3d43265c33653f17bb411336269dfab

fix bug 接口对接和样式调整

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

@@ -3,36 +3,40 @@
        <view class="item flex" v-for="(item,index) of list" :key="index">
            <view class="img">
                <image class="img img100"
                    src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ff/fff3027bd0a146478fd1f0aae816a028%E5%BE%AE%E4%BF%A1%E6%88%AA%E5%9B%BE_20240710224139.png">
               :src="item.cover">
                </image>
                <view class="level">
                    A级
          {{ ite.levelStr}}
                </view>
            </view>

            <view class="m-l-12 info-container flex1">
                <view class="title">
                    橙色芭比
          {{ item.name || '-' }}
                    <view class="price">
                        ￥6.60/扎
            ￥{{ item.price || 0 }}/扎
                    </view>
                </view>
                <view class="tags">
                    <view class="tag red">限时抢购</view>
                    <view class="tag green">品质严选</view>
          <view class="tag red" v-for="(tag,k) of item.tagArr" :class="[k===0?'red':'green']" :key="tag">{{
              tag
            }}
          </view>
          <!--                    <view class="tag red">限时抢购</view>-->
          <!--                    <view class="tag green">品质严选</view>-->
                </view>
                <view class="shop-name">
                    小石头花卉
          {{ item.supplierName || '佚名' }}
                </view>
                <view class="other-info flex">
                    <view class="m-r-15">
                        已售:7
            已售:{{ item.sales || 0 }}
                    </view>
                    <view class="m-r-15">
                        剩余:13
            剩余:{{ item.stock || 0 }}
                    </view>
                    <view class="m-r-15">
                        1支/扎
            {{ item.unit || 0 }}
                    </view>
                </view>
            </view>
@@ -44,9 +48,28 @@
    export default {
        data() {
            return {
                list: [{}, {}, {}, {}]
      // list: [{}, {}, {}, {}]
            };
  },
  mounted() {
    this.listApi = '/api/customer/flower/list'
    this.page.size = 4
    this.page.current = 1
    this.getList('post')
  },
  methods: {
    getList_after() {
      if (this.list) {
        for (var item of this.list) {
          item.tagArr = []
          if (item.tags) {
            item.tagArr = item.tags.split(",") || []
        }
        }
      }
    }
  },

    }
</script>

@@ -89,6 +112,7 @@
                        font-size: 24rpx;
                        color: #CD1212;
                        margin-right: 12rpx;
          text-align: center;
                    }

                    .tag.green {

 pages/home/components/home-zones.vue

@@ -1,12 +1,12 @@
<template>
  <view class="home-zones">
    <view class="c" v-for="(item,index) of list">
    <view class="c" v-for="(item,index) of list"  @click.stop="toDetail(item.id)">
      <image class="p1 img100 m-t-12" :lazy-load="true" mode="aspectFill"
             :src="item.bgUrl">
      </image>
      <view class="c-txt-1">
        <view class="title">{{ item.name }}</view>
        <view class="flex" @click.stop="toDetail(item.id)">
        <view class="flex">
          <view class="desc">查看详情</view>
          <view class="right m-l-5">
            <uni-icons class="icon" type="right" color="#C3B8A0" size="12"></uni-icons>
@@ -75,7 +75,7 @@
  methods: {
    toDetail(id) {
      uni.navigateTo({
        url: `//sub_pages/customer/trade/list?zoneId=${id}`
        url: `/sub_pages/customer/trade/list?zoneId=${id}`
      })
    },
  },

 pages/home/home.vue

@@ -49,7 +49,7 @@
        <!-- tip -->

        <view class="m-t-12" @click="getNoticeMore">

            <uni-notice-bar class="notice-bar" color="#333" background-color="#fff" show-get-more show-icon

                :scrollable="scrollable" :text="currentNotice.title" :key="currentNotice.id" />

                      :scrollable="scrollable" :text="currentNotice.title||'暂无公告'" :key="currentNotice.id"/>

            <span v-if="!currentNotice||!currentNotice.id">&nbsp;</span>

        </view>

        <!-- 当前分类 -->

@@ -142,9 +142,7 @@
                hide_footer: false,

                noticeList: [],

                currentNoticeIndex: 0,

                currentNotice: {



                }

      currentNotice: {}

            };

        },

        // onShareAppMessage() {

@@ -183,9 +181,7 @@
            // })



            //获取banner图

            this.$http.request('get', '/api/pub/banner/list', {



            }).then(res => {

    this.$http.request('get', '/api/pub/banner/list', {}).then(res => {

                if (res.code == 0) {

                    this.banners = res.data.records || []

                }

@@ -199,7 +195,6 @@
            }







            //公告

            this.$http.request('get', '/api/announcement/page', {

                params: {

@@ -207,7 +202,7 @@
                    status: 'A'

                }

            }).then(res => {

                if (res.code == 0) {

      if (res.code === 0) {

                    this.noticeList = (res.data && res.data.records || [])

                    console.log('this.noticeList', this.noticeList)

                    if (this.noticeList.length > 0) {

@@ -246,6 +241,9 @@
        methods: {

            buttonSearchFlow() {

                console.log('buttonSearchFlow')

      uni.navigateTo({

        url: '/sub_pages/trade/list?name=' + this.search_flow

      })

            },

            pop(status) {

                this.hide_footer = !!status


 pages/login/supplier-reg.vue

@@ -5,7 +5,7 @@
      <view style="padding: 20rpx;text-align: center;background-color: #fff;">仅限花满芫合伙人入驻</view>
      <!-- #endif -->e

      <view v-if="source==='step'" class="" style="background-color: #fff;margin-top: 20rpx;padding: 20rpx;">
      <view v-if="source==='step'" class="" style="background-color:#ffffff;padding: 20rpx;padding-top: 60rpx;">
        <u-steps current="1">
          <u-steps-item title="信息填写" class="u-steps-item">
          </u-steps-item>

 pages/order/order.vue

@@ -19,7 +19,7 @@
  },
  onLoad(options) {
    this.query.status = options.status || ''
    this.listApi = `/api/customer/list`
    this.listApi = `/api/customer/order/list`
    this.getList()
  },
  onReachBottom() {
@@ -51,12 +51,17 @@
        <view>消费订单：￥<span>{{ '0' }}</span> 总消费：￥<span>{{ '0' }}</span></view>
      </view>
    </view>
    <view class="status-list m-t-12 flex">
      <view v-for="each of status" :key="each.value" class="status-each" :class="[query.status===each.value?'cur':'']">
    <view class="status-list m-t-12 flex flex-wrap-normal">
      <view v-for="each of status" :key="each.value"
            @click.stop="(e)=>{
              query.status = each.value || '';
              refreshList();
            }"
            class="status-each" :class="[query.status===each.value?'cur':'']">
        {{ each.name }}
      </view>
    </view>
    <no-data v-if="!list||list.length==0" style="width: 100%;" class="m-t-12"></no-data>
    <no-data v-if="!list||list.length===0" style="width: 100%;" class="m-t-12"></no-data>
    <view v-for="(item,index) in list" :key="index" class="m-t-12">
      <view @click.stop="toDetail(item)" class="order-item list-item">
        <view class="title flex">
@@ -151,6 +156,7 @@
      padding-left: 20rpx;
      padding-right: 20rpx;
      width: fit-content;
      min-width: 120rpx;
      text-align: center;
    }


 pages/user/supplier-user.vue

@@ -100,12 +100,12 @@
          <view>我的服务</view>

        </view>

        <view class="flex service-icons-container">

          <view class="service-icons" @click="goto('/sub_pages/customer/follow/follow',true)">

          <view class="service-icons" @click="goto('/sub_pages/customer/self/follow',true)">

            <image src="../../static/images/customer/service/service-icon-1.png" class="service-icon ">

            </image>

            <view>关注店铺</view>

          </view>

          <view class="service-icons" @click="goto('/sub_pages/customer/collect/collect',true)">

          <view class="service-icons" @click="goto('/sub_pages/customer/self/collect',true)">

            <image src="../../static/images/customer/service/service-icon-2.png" class="service-icon ">

            </image>

            <view>我的收藏</view>

@@ -115,19 +115,19 @@
            </image>

            <view>地址管理</view>

          </view>

          <view class="service-icons">

          <view class="service-icons"  @click.stop="$meesage.showToast('敬请期待')" >

            <image src="../../static/images/customer/service/service-icon-4.png" class="service-icon ">

            </image>

            <view>售后规则</view>

          </view>

        </view>

        <view class="flex service-icons-container">

          <view class="service-icons">

          <view class="service-icons"  @click.stop="$meesage.showToast('敬请期待')" >

            <image src="../../static/images/customer/service/service-icon-5.png" class="t2 service-icon ">

            </image>

            <view>新手帮助</view>

          </view>

          <view class="service-icons">

          <view class="service-icons"  @click.stop="$meesage.showToast('敬请期待')" >

            <image src="../../static/images/customer/service/service-icon-6.png" class="t2 service-icon ">

            </image>

            <view>运费详查</view>


 sub_pages/customer/customer-info/customer-info.vue

@@ -1,6 +1,6 @@
<template>
  <view class="container-page" style="padding: 0rpx;">
    <view v-if="source==='step'" class="m-t-20">
    <view v-if="source==='step'" class="" style="padding-top:40rpx">
      <u-steps current="0">
        <u-steps-item title="信息填写" class="u-steps-item" style="font-size: 28rpx;">
        </u-steps-item>
@@ -16,7 +16,6 @@

        </view>
      </view>



      <view class="form-item before-line">

 sub_pages/customer/self/collect.vue

@@ -1,6 +1,6 @@
<template>
  <view class="page-collect">
    <view class="search-container m-t-12 flex">
  <view class="page-collect p20">
    <view class="search-container bg-white flex">
      <view class="flex1 input">
        <u-input placeholder="请输入花名" v-model="query.name">
          <template slot="suffix">
@@ -9,7 +9,7 @@
        </u-input>
      </view>
    </view>
    <view class="component-filter-container">
    <view class="component-filter-container p10 bg-white">
      <view class="flex1" @click.stop="order_show=true">
        {{ this.query.columnStr || '排序' }}
        <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
@@ -20,6 +20,8 @@
        ></image>
      </view>
    </view>
    <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>


    <u-picker :show="level_show" @confirm="select_level" keyName="label" :columns="level_columns"
              @cancel="level_show=false"></u-picker>

 sub_pages/customer/self/follow.vue

@@ -1,5 +1,7 @@
<template>
  <view class="follow-page">
    <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>

    <view class="follow-item m-b-40" v-for="(item,index) of list" :key="index">
      <image class="avatar img100" :src="item.avatar" mode="aspectFill"></image>
      <view class="info">

 sub_pages/customer/shopping/confirm.vue

@@ -245,7 +245,7 @@
    </view>
    <view class="bottom-price flex">
      <view class="m-t-12 m-l-0 m-r-a">
        合计:￥ {{ (dto.totalAmount || 0) + (current_transport.fee || 0) || 0 }} 元
        合计:<span class="t-red">￥ {{ (dto.totalAmount || 0) + (current_transport.fee || 0) || 0 }} </span>元
      </view>
      <view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitOrder">
        提交订单

 sub_pages/customer/trade/list.vue

@@ -30,7 +30,7 @@
      </view>

    </view>

    <view class="" style="min-height: calc(100vh - 260rpx);">

      <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>

      <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>

      <view v-else>

        <!-- 查询条件 -->

        <view class="component-filter-container">

@@ -157,6 +157,7 @@
  data() {

    return {

      query: {

        name:'',

        category: '',

        zoneId: '',

        levelStr: '',

@@ -181,6 +182,7 @@
    console.log('options', options)

    this.query.category = options.categoryId || ''

    this.query.zoneId = options.zoneId || ''

    this.query.name = options.name || ''

    this.listApi = '/api/customer/flower/list'

    this.getList('post')

    this.$http.request('get', '/api/code/value', {