Merge branch 'main' of https://gitea.hmily.club/pdkj/store-manage-app

src/pages/expense-account/index.vue

@@ -15,48 +15,35 @@
         :scrollable="false"
         lineColor="#ee2c37"
         :list="tabList"
+        :current="tabIndex"
+        @change="tabChange"
       ></uv-tabs>
     </uv-sticky>
-    <mescroll-body @init="mescrollInit" @down="downCallback" @up="upCallback">
+    <view class="px-base space-y-20rpx mt-30rpx">
-      <view class="px-base space-y-20rpx mt-30rpx">
+      <MescrollItem
-        <view
+        ref="mescrollItem0"
-          v-for="item in list"
+        :top="88"
-          :key="item.id"
+        :i="0"
-          class="card-shadow bg-white rounded-19rpx p-base space-y-10rpx"
+        :index="tabIndex"
-        >
+        :apiUrl="tabList[0].apiUrl"
-          <view class="flex items-center justify-between">
+      >
-            <view class="text-30rpx"> {{ item.type.name }} </view>
+        <template v-slot="{ list }">
-            <view
+          <Item v-for="item in list" :key="item.id" :item="item" @click="detail" />
-              :style="[
+        </template>
-                {
+      </MescrollItem>
-                  color: statusFun(
+      <MescrollItem
-                    item.workflow_check.check_status,
+        ref="mescrollItem1"
-                    'statusExpense',
+        :i="1"
-                    'color'
+        :top="88"
-                  ),
+        :index="tabIndex"
-                },
+        :apiUrl="tabList[1].apiUrl"
-              ]"
+        :params="tabList[1].params"
-              class="text-24rpx"
+      >
-              >{{ item.workflow_check.check_status_text }}</view
+        <template v-slot="{ list }">
-            >
+          <Item v-for="item in list" :key="item.id" :item="item" @click="checkDetail" />
-          </view>
+        </template>
-          <view class="text-24rpx text-hex-999999 flex">
+      </MescrollItem>
-            <view class="w-140rpx">报销金额</view>
+    </view>
-            <view class="text-primary">{{ item.expense }}</view>
-          </view>
-          <view class="text-24rpx text-hex-999999 flex">
-            <view class="w-140rpx">报销时间</view>
-            <view class="text-hex-333">{{ timeFormat(item.created_at) }}</view>
-          </view>
-          <view class="text-24rpx text-hex-999999">
-            <view class="">
-              <text class="w-140rpx inline-block">报销原因:</text>
-              <text class="text-hex-333 leading-27rpx">{{ item.reason }}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </mescroll-body>
   </view>
 </template>
 <script setup>
@@ -65,44 +52,37 @@ import { http } from '@/utils/request'
 import { ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
-import useMescroll from '@/uni_modules/mescroll-uni/hooks/useMescroll.js'
+import useMescrollMore from '@/uni_modules/mescroll-uni/hooks/useMescrollMore.js'
 import { timeFormat } from '@climblee/uv-ui/libs/function'
 import statusFun from '@/utils/status'
-const { mescrollInit, downCallback, getMescroll } = useMescroll(
+import MescrollItem from '@/components/mescroll-api/more.vue'
+import Item from './item.vue'
+
+const mescrollItem0 = ref(null)
+const mescrollItem1 = ref(null)
+
+const mescrollItems = [mescrollItem0, mescrollItem1]
+const { tabIndex, getMescroll, scrollToLastY } = useMescrollMore(
+  mescrollItems,
   onPageScroll,
   onReachBottom
 )
-const list = ref([])
 
 const tabList = ref([
   {
     name: '我的报销',
+    apiUrl: '/reimbursements',
   },
   {
     name: '报销审核',
+    apiUrl: '/workflow',
+    params: { subject_type: 'reimbursements', include: 'employee,type' }
   },
 ])
 
-const upCallback = async (mescroll) => {
+const tabChange = ({ index }) => {
-  const { size, num } = mescroll
+  tabIndex.value = index
-
+  scrollToLastY()
-  try {
-    const resData = await http.get('/reimbursements', {
-      params: {
-        per_page: size,
-        page: num,
-      },
-    })
-    const curPageData = resData || []
-    if (num === 1) list.value = []
-    list.value = list.value.concat(curPageData)
-    mescroll.endSuccess(curPageData.length)
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr() // 请求失败, 结束加载
-  } finally {
-    // firstloading.value = false
-  }
 }
 
 const goPath = (url) => {
@@ -110,4 +90,13 @@ const goPath = (url) => {
     url,
   })
 }
+
+// 跳转详细页
+const detail = (item) => {
+  console.log(item.id)
+}
+// 跳转审核页
+const checkDetail = (item) => {
+  console.log(item.id)
+}
 </script>

src/pages/expense-account/item.vue

@@ -0,0 +1,43 @@
+<template>
+  <view class="card-shadow bg-white rounded-19rpx p-base space-y-10rpx" @click="detail(item)">
+    <view class="flex items-center justify-between">
+      <view class="text-30rpx"> {{ item.type?.name }} </view>
+      <view :style="[
+    {
+      color: statusFun(
+        item.workflow_check?.check_status,
+        'statusExpense',
+        'color'
+      ),
+    },
+  ]" class="text-24rpx">{{ item.workflow_check?.check_status_text }}</view>
+    </view>
+    <view class="text-24rpx text-hex-999999 flex">
+      <view class="w-140rpx">报销金额</view>
+      <view class="text-primary">{{ item.expense }}</view>
+    </view>
+    <view class="text-24rpx text-hex-999999 flex">
+      <view class="w-140rpx">报销时间</view>
+      <view class="text-hex-333">{{ timeFormat(item.created_at) }}</view>
+    </view>
+    <view class="text-24rpx text-hex-999999">
+      <view class="">
+        <text class="w-140rpx inline-block">报销原因:</text>
+        <text class="text-hex-333 leading-27rpx">{{ item.reason }}</text>
+      </view>
+    </view>
+  </view>
+</template>
+<script setup>
+import { timeFormat } from '@climblee/uv-ui/libs/function'
+import statusFun from '@/utils/status'
+const emits = defineEmits(['click'])
+
+const props = defineProps({
+  item: Object,
+})
+
+const detail = (item) => {
+  emits('click', item)
+}
+</script>

src/pages/home/components/store-drop-down/index.vue

@@ -2,16 +2,16 @@
   <view>
     <uv-sticky bgColor="#fff">
       <view class="flex-center h-44px">
-        <view class="flex-center flex-1" @click="selectMenu({ name: 'shore' })">
+        <view class="flex-center flex-1" @click="openCity">
-          <view>全部区域</view>
+          <view>{{ selected.area_text }}</view>
           <uv-icon
             class="ml-10rpx"
             size="20rpx"
             name="arrow-down-fill"
           ></uv-icon>
         </view>
-        <view class="flex-center flex-1" @click="selectMenu({ name: 'store' })">
+        <view class="flex-center flex-1" @click="openStore">
-          <view>全部区域</view>
+          <view>{{ selected.store_text }}</view>
           <uv-icon
             class="ml-10rpx"
             size="20rpx"
@@ -21,173 +21,138 @@
       </view>
     </uv-sticky>
     <uv-picker
-      ref="shoreRef"
+      ref="cityRef"
       keyName="name"
-      @change="shoreChange"
+      :columns="cityList"
-      :columns="shoreList"
+      :loading="cityLoading"
-      @confirm="shoreConfirm"
+      cancelText="重置"
-    ></uv-picker>
+      @confirm="cityConfirm"
+      @change="cityChange"
+      @cancel="cityReset"
+    />
 
     <uv-picker
       ref="storeRef"
-      keyName="address"
+      keyName="title"
-      @change="shoreChange"
       :columns="storeList"
-      @confirm="shoreConfirm"
+      :loading="storeLoading"
+      @confirm="storeConfirm"
     ></uv-picker>
   </view>
 </template>
 <script>
 import { http } from '@/utils/request'
-import data from './da.json'
 
 export default {
-  onPageScroll() {
+  name: 'StoreDropDown',
-    // 滚动后及时更新位置
-    // this.$refs.dropDown.init()
-  },
-  computed: {
-    dropItem(name) {
-      return (name) => {
-        return {
-          label: name,
-          value: name,
-        }
-      }
-    },
-    // 获取当前下拉筛选项
-    currentDropItem() {
-      return this[this.activeName]
-    },
-  },
   data() {
     return {
-      shoreList: [],
+      cityData: {},
+      // 已选择的地区 {province: {code, name}, city: {code, name}, area_text: '全部区域', store: {id, name}, store_text: '全部门店'}
+      selected: {
+        area_text: '全部区域',
+        store_text: '全部门店',
+      },
+      cityLoading: false,
+      cityList: [],
+      storeLoading: false,
       storeList: [],
-      // 表示value等于这些值，就属于默认值
-      defaultValue: [0, 'all'],
-      // 筛选结果
-      result: [],
-      activeName: 'shore',
-      shore: {
-        label: '全部区域',
-        activeIndex: [0, 0],
-        color: '#333',
-        activeColor: '#2878ff',
-      },
-      store: {
-        label: '全部门店',
-        activeIndex: 0,
-        color: '#333',
-        activeColor: '#2878ff',
-      },
-      cityData: data,
     }
   },
   created() {
     this.init()
   },
   methods: {
-    async init() {
+    init() {
-      const province = this.cityData.province
+      this.cityLoading = true
-      this.shoreList = [
+      http.get('/region').then(res => {
-        province,
+        this.cityLoading = false
-        this.getCityByProvince(province[this.shore.activeIndex[1]].code),
+        this.cityData = res
-      ]
+        const firstProvince = this.cityData.province[0]
-    },
+        this.cityList = [
-    change(e) {
+          this.cityData.province,
-      console.log('弹窗打开状态：', e)
+          this.findCityByProvince(firstProvince.code)
-    },
+        ]
-    /**
+        this.findStoreList()
-     * 点击每个筛选项回调
+      }).catch(error => {
-     * @param {Object} e { name, active, type } = e
+        this.cityLoading = false
-     */
-    selectMenu(e) {
-      const { name } = e
-      this.activeName = name
-      if (name === 'shore') {
-        const active = this.shore.activeIndex
-        const list = this.getCityByProvince(this.shoreList[0][active[0]].code)
-        this.shoreList[1] = list
-        this.$refs.shoreRef.setColumnValues(1, list)
-        this.$refs.shoreRef.setIndexs(active, true)
-        this.$refs.shoreRef.open()
-      }
-      if (name === 'store') {
-        this.$refs.storeRef.open()
-      }
-    },
-    /**
-     * 点击菜单回调处理
-     * @param {Object} item 选中项 { label,value } = e
-     */
-    clickItem(e) {},
-    shoreChange(e) {
-      const { columnIndex, index } = e
-      if (columnIndex == 0) {
-        const item = this.shoreList[columnIndex][index]
-        this.shoreList[1] = this.getCityByProvince(item.code)
-        this.$refs.shoreRef.setColumnValues(
-          1,
-          this.getCityByProvince(item.code)
-        )
-      }
-    },
-    shoreConfirm(e) {
-      this.shore.activeIndex = e.indexs
-      const item = {
-        name: 'shore',
-      }
-      const cityIndex = this.shore.activeIndex[1]
-      const index = cityIndex == 0 ? 0 : 1
-      const index2 = e.indexs[index]
-    },
-    getCityByProvince(province) {
-      return [
-        {
-          name: '全部',
-          code: 'all',
-        },
-      ].concat(this.cityData.city[province])
-    },
-
-    getStoreByCity(city) {
-      const res = http.get('/auth/stores', {
-        params: {
-          city: city,
-        },
       })
-      this.storeList = [
-        {
-          id: 1,
-          title: '1',
-          master_id: 1,
-          category_id: 'store_category_1_1',
-          business_id: 'store_business_1',
-          level_id: 'store_level_2',
-          region: {
-            city: '天津市市辖区',
-            code: 120100,
-            street: null,
-            cityCode: 120100,
-            district: null,
-            province: '天津市',
-            districtCode: 0,
-            provinceCode: 120000,
-          },
-          address: '回龙观(地铁站)',
-          lon: '116.34266369754',
-          lat: '40.076418413591',
-          profit_ratio: 0,
-          profit_money: '0.00',
-          business_status: 1,
-          created_at: '2024-04-03 17:17:02',
-          updated_at: '2024-04-03 17:17:02',
-          business_status_text: '开业',
-          business_status_color: 'success',
-        },
-      ]
     },
-  },
+    findStoreList() {
+      const params = {}
+      if (this.selected.province) {
+        params.province_code = this.selected.province.code
+      }
+      if (this.selected.city) {
+        params.city_code = this.selected.city.code
+      }
+      this.storeLoading = true
+      http.get('/auth/stores', { params }).then(res => {
+        this.storeLoading = false
+        res.unshift({title: '全部门店', id: 'all'})
+        this.storeList = [res]
+      }).catch(error => {
+        this.storeLoading = false
+      })
+    },
+    loadData() {
+      console.log('加载数据....', this.selected)
+      this.$emit('refresh', this.selected)
+    },
+    openCity() {
+      this.$refs.cityRef.open()
+    },
+    cityReset() {
+      this.selected = { area_text: '全部区域', store_text: '全部门店' }
+      this.loadData()
+    },
+    cityConfirm(e) {
+      const province = e.value[0]
+      const city = e.value[1]
+      if (province && city) {
+        if (province.code != 'all') {
+          this.selected.province = province
+        }
+        if (city.code != 'all') {
+          this.selected.city = city
+        }
+        this.selected.area_text = city.code == 'all' ? province.name : city.name
+        this.storeReset()
+        this.findStoreList()
+        this.loadData()
+      }
+    },
+    cityChange(e) {
+      const { columnIndex , index} = e
+      if (columnIndex == 0) {
+        const province = this.cityData.province[index]
+        this.$refs.cityRef.setColumnValues(1, this.findCityByProvince(province.code))
+      }
+    },
+    openStore() {
+      this.$refs.storeRef.open()
+    },
+    storeConfirm(e) {
+      const store = e.value[0]
+      if (store) {
+        if (store.id != 'all') {
+          this.selected.store = store
+        }
+        this.selected.store_text = store.title
+        this.loadData()
+      }
+    },
+    storeReset() {
+      this.selected.store_text = '全部门店'
+      this.selected.store = null
+    },
+    findCityByProvince(provinceCode) {
+      const cityList = this.cityData.city[provinceCode]
+      if (cityList.length > 1 && cityList[0].code != 'all') {
+        cityList.unshift({name: '全部', code: 'all'})
+      }
+      return cityList
+    }
+  }
 }
 </script>

src/pages/login/LoginForm.vue

@@ -50,11 +50,11 @@ const form = ref({
 
 const handleClick = async () => {
   try {
-    // const { username, password } = form.value
+    const { username, password } = form.value
-    // await userStore.login({
+    await userStore.login({
-    //   username,
+      username,
-    //   password,
+      password,
-    // })
+    })
     uni.switchTab({
       url: '/pages/home/index',
     })