xuxueyang
2024-07-26 799b6a04bbc0a56972c5be392518c9da6308e6e0
update
已修改6个文件
93 ■■■■■ 文件已修改
environments/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/supplier-reg.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/shopping/confirm.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/shopping/shopping.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/trade/list.vue 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/trade/trade.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
environments/index.js
@@ -1,7 +1,7 @@
export default {
    
    // httpBaseUri: 'https://www.hmyxianhua.com/flower',
    httpBaseUri: 'http://47.99.58.211/flower',
    httpBaseUri: 'https://www.hmyxianhua.com/flower',
    // httpBaseUri: 'http://47.99.58.211/flower',
    // httpBaseUri: 'http://localhost:8080/flower',
    clientId: '',
pages/login/supplier-reg.vue
@@ -302,7 +302,7 @@
        tjson = this.$storage.getItem('cache_partner_info')
        // #endif
        // #ifdef PUB_CUSTOMER
        this.$storage.getItem('cache_customer_info')
        tjson = this.$storage.getItem('cache_customer_info')
        // #endif
        if (!tjson) {
sub_pages/customer/shopping/confirm.vue
@@ -165,7 +165,7 @@
          <view class="item-each m-t-12 flex">
            <image class="img img100 m-r-6" :src="item.url||item.cover"></image>
            <view>
              <view class="title"><span>{{ item.levelStr || '-' }}</span>&nbsp;&nbsp;{{ item.name || '-' }}</view>
              <view class="title"><span class="m-r-5" style="display: inline-block;">{{item.categoryStr||''}}</span><span v-if="item.levelStr" class="m-r-5" style="display: inline-block;">{{ item.levelStr || '' }}</span>{{ item.name || '-' }}</view>
              <view class="price">
                {{ item.price || 0 }}*{{ item.num }}扎
              </view>
@@ -257,7 +257,7 @@
    </view>
    <view class="bottom-price flex">
      <view class="m-t-12 m-l-0 m-r-a">
        合计:<span class="t-red">¥ {{ (dto.totalAmount || 0) + (current_transport.fee || 0) || 0 }} </span>元
        合计 <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/shopping/shopping.vue
@@ -32,13 +32,14 @@
                <radio :checked="ids.indexOf(dto.id)>=0" @click="changeItem(dto,'flower')"></radio>
                <image class="img img100 m-r-6" :src="dto.url||dto.cover"></image>
                <view class="flex1">
                  <view class="title"><span>{{ dto.levelStr || '-' }}</span>&nbsp;&nbsp;{{ dto.name || '-' }}</view>
                  <view class="title"><span class="m-r-5" style="display: inline-block;">{{item.categoryStr||''}}</span><span v-if="item.levelStr" class="m-r-5" style="display: inline-block;">{{ item.levelStr || '' }}</span>{{ dto.name || '-' }}</view>
                  <view class="price">
                    {{ dto.price || '-' }}元/扎
                  </view>
                  <view class="flex">
                    <view class="desc m-t-12">
                    <view class="desc m-t-12 flex">
                      <view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
                      <view class="m-r-15">颜色:{{ dto.color || '-' }}</view>
                    </view>
                    <view class="button-icons flex m-l-a m-r-0">
                      <uni-icons v-if="dto.num&&dto.num>=1" type="minus" size="32"
@@ -65,7 +66,7 @@
        全选
      </view>
      <view class="m-t-12 m-l-a m-r-20 text-center">
        合计:<span class="t-red">¥ {{ totalprice || 0 }}</span> 元
        合计 <span class="t-red">¥ {{ totalprice || 0 }}</span> 元
      </view>
      <view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitPay">
        提交订单
sub_pages/customer/trade/list.vue
@@ -1,24 +1,24 @@
<template>
  <!-- 列表页面 -->
  <view class="trade-list">
    <view class="category-detail flex">
        <view class="category-detail flex" v-if="query.category">
      <view class="flex1 info">
        <view class="title flex">
          <view>牛油果泡泡</view>
                    <view>{{categoryInfo.name||'-'}}</view>
          <view>
            <image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
          </view>
        </view>
        <view class="desc">
          规格:10支/扎
                    规格:{{categoryInfo.unit}}
        </view>
        <view class="desc">
          估重:1.3kg/扎
                    颜色:{{categoryInfo.color}}
        </view>
        <view class="desc">
            <!--     <view class="desc">
          包袋:棉袋
        </view>
                </view> -->
      </view>
      <view class="info-price">
        <view class="title">当日均价</view>
@@ -40,8 +40,7 @@
          </view>
          <view class="flex1" @click.stop="level_show=true">
            {{ this.query.levelStr || '级别' }}
            <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"
            ></image>
                        <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
          </view>
          <!--                    <view class="flex1">-->
@@ -57,37 +56,36 @@
        </view>
      </view>
      <view class="component-shop-item flex" v-for="(item,index) of list" :key="index"
      >
            <view class="component-shop-item flex" v-for="(item,index) of list" :key="index">
        <view class="img" @click.stop="toDetail(item)">
          <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">
          </image>
          <view class="level">
            A级
                        {{levelStr||''}}
          </view>
        </view>
        <view class="m-l-12 info-container flex1">
          <view @click.stop="toDetail(item)">
            <view class="title">
              橙色芭比
                            {{item.name||'-'}}
              <view class="price">
                ¥6.60/扎
                                ¥{{item.price||0}}元/扎
              </view>
            </view>
            <view class="shop-name">
              牛油果泡泡·白色
                            {{item.supplierName}}
            </view>
            <view class="other-info flex">
              <view class="m-r-15">
                已售:7
                                已售:{{item.sales}}
              </view>
              <view class="m-r-15">
                剩余:13
                                剩余:{{item.stock}}
              </view>
              <view class="m-r-15">
                1支/扎
                                {{item.unit}}
              </view>
            </view>
          </view>
@@ -105,7 +103,8 @@
      </view>
      <view class="icon-shop" v-if="list&&list.length>0" @click="goto('/sub_pages/customer/shopping/shopping',true)">
            <view class="icon-shop" v-if="list&&list.length>0"
                @click="goto('/sub_pages/customer/shopping/shopping',true)">
        <!-- 购物图标 -->
        <!-- 如果有购买的东西,就要附带数字了 -->
        <view v-if="shoptotal>0" class="number">
@@ -166,15 +165,20 @@
        params: [],
        columnStr: '',
      },
                categoryInfo: {},
      params: [],
      shoptotal: 0,
      list: [],
      level_show: false,
      level_columns: [[]],
                level_columns: [
                    []
                ],
      order_show: false,
      order_columns: [[]]
                order_columns: [
                    []
                ]
    }
  },
  async onLoad(options) {
@@ -209,6 +213,9 @@
        value: ''
      })
    })
            if (this.query.category) {
                await this.getDetail()
            }
    // await this.getList('post')
    // this.
@@ -223,6 +230,22 @@
    uni.stopPullDownRefresh()
  },
  methods: {
            async getDetail() {
                this.$message.showLoading()
                //获取到分类的详情信息
                const {
                    code,
                    data
                } = await this.$http.request('get', '/api/customer/flower/category/tree/view', {
                    params: {
                        id: this.query.category
                    }
                })
                this.$message.hideLoading()
                if (code == 0) {
                    this.categoryInfo = data || {}
                }
            },
    updateValue(item, value) {
      item.value = value
      this.$set(item, 'value', value)
@@ -250,13 +273,13 @@
      this.$message.showLoading()
      const res = await this.$http.request('get', '/api/supplier/flower/params', {
        params: {
          categoryId: this.dto.category
                        categoryId: this.query.category
        }
      })
      this.$message.hideLoading()
      if (res.code === 0) {
        // this.columns_params = res.data || []
        this.dto.params = res.data || []
                    this.params = res.data || []
        this.$refs.popup_param.open()
      }
@@ -305,13 +328,14 @@
        return
      }
      this.$message.showLoading()
      const {code} = await http.request('post', '/api/customer/flower/cart/change-num', {
                const {
                    code
                } = await http.request('post', '/api/customer/flower/cart/change-num', {
            data: {
              id: item.id,
              num: addnum
            }
          }
      )
                })
      this.$message.hideLoading()
      if (code === 0) {
        item.shopnum += addnum
sub_pages/customer/trade/trade.vue
@@ -131,7 +131,9 @@
        async onLoad() {
            //加载分类
            this.$message.showLoading()
            this.$http.request('get', '/api/customer/flower/category/tree', {}).then(res => {
                this.$message.hideLoading()
                var data = res.data
                this.list = data || []
                if (this.list.length > 0) {