admin1/jiangchengfeiyi-xiaochengxu
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合完了

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-19 20:54:41 +08:00
parent f6edd09641
commit a1615640c4
10 changed files with 106 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages.json
View File

@ -116,7 +116,8 @@
"path" : "pages/mine/main/main",
"style" :
{
"navigationBarTitleText" : ""
"navigationBarTitleText" : "",
"enablePullDownRefresh":true //开启下拉刷新
}
},
{

7
pages/coupon/CouponMall/CouponMall.vue
View File

@ -46,11 +46,10 @@
<script setup lang="ts">
<script setup>
import {ref, onMounted, nextTick, onUnmounted} from 'vue'
import { baseUrl } from '@/api/request';
import confirmPopupVue from '../component/confirmPopup.vue';
import popupVue from '../../popup.vue';
import emitter from '../../../utils/emitter';
import { couponUrl } from '../../../common/globalImagesUrl';
import { onLoad } from "@dcloudio/uni-app";
@ -89,6 +88,8 @@
})
onUnmounted(() => {
emitter.emit('flushCouponList')
emitter.off('closeConfirmPopup', closeConfirmPopupHandler)
emitter.off('confirmExchange', confirmExchangeHandler)
@ -122,7 +123,7 @@
})
}
const exchangeCoupon = (val:any) => {
const exchangeCoupon = (val) => {
coupon.value = val
exchange.value.open('center')
}

41
pages/coupon/component/couponPopup.vue
View File

@ -63,7 +63,7 @@
</view>
</template>
<script setup lang="ts">
<script setup>
import {onMounted, onUnmounted, ref} from 'vue'
import emitter from '../../../utils/emitter';
import { baseUrl } from '../../../api/request';
@ -78,9 +78,10 @@
const idx = ref(-1)
const isShow = ref(true)
const borderStyle = ref({})
let totalAmount = 0
const myCouponList = ref([])
const cookie = wx.getStorageSync("cookie") //请求头
let totalAmount = 0
let couponMap = null
@ -93,10 +94,11 @@
const flushCouponListHandler = () => {
getMyCouponList()
}
const getTotalPriceHandler = (val:any) => {
const getTotalPriceHandler = (val) => {
totalAmount = val
getMyCouponList()
}
@ -105,14 +107,17 @@
onMounted(() => {
emitter.on('getTotalPrice', getTotalPriceHandler)
emitter.on('flushCouponList', flushCouponListHandler)
})
onUnmounted(() => {
uni.removeStorageSync('couponMap')
emitter.off('getTotalPrice', getTotalPriceHandler)
emitter.off('flushCouponList', flushCouponListHandler)
})
const changeStateLeft = (val:any) => {
const changeStateLeft = (val) => {
if (!val) {
isShow.value = !isShow.value
borderStyle.value.borderBottom = 'solid 0px'
@ -120,7 +125,7 @@
}
}
const changeStateRight = (val:any) => {
const changeStateRight = (val) => {
if (val) {
isShow.value = !isShow.value
borderStyle.value.borderBottom = 'solid 1.88rpx #d9d9d9'
@ -132,7 +137,7 @@
emitter.emit('closeCoupon')
}
const selectOne = (val:any) => {
const selectOne = (val) => {
if (!isShow.value) return
idx.value = val
for (var i = 0; i < checkedArr.value.length; i ++ ) {
@ -158,23 +163,35 @@
const getMyCouponList = async () => {
couponMap = uni.getStorageSync('couponMap')
console.log('读缓存======================>', couponMap)
if (couponMap) {
if (isShow.value) myCouponList.value = couponMap['可用']
else myCouponList.value = couponMap['不可用']
checkedArr.value = new Array(myCouponList.value.length).fill(false)
return
}
const res = await uni.request({
url: baseUrl + '/coupon/list/use',
url: baseUrl + '/coupon/list/all/own',
method: 'POST',
header: {
cookie
},
data: {
currentAmount: totalAmount,
isAvailable: isShow.value
currentAmount: totalAmount
}
})
myCouponList.value = res.data.data
console.log('发请求=====================>', res.data.data)
couponMap = res.data.data
uni.setStorageSync('couponMap', couponMap)
if (isShow.value) myCouponList.value = couponMap['可用']
else myCouponList.value = couponMap['不可用']
checkedArr.value = new Array(myCouponList.value.length).fill(false)
}
const jumpToMall = () => {
uni.removeStorageSync('couponMap')
uni.navigateTo({
url: '/pages/coupon/CouponMall/CouponMall'
})

16
pages/mine/main/main.vue
View File

@ -121,7 +121,17 @@ import { baseUrl } from '../../../api/request';
import { getFonts } from '../../../common/globalFont';
import { mineUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
import { onPullDownRefresh } from '@dcloudio/uni-app';
const bkgUrl = ref(mineUrl + '/main/bkg.png')
onPullDownRefresh( async ()=>{ //下拉刷新
await getMyUser()
setTimeout(()=>{
uni.stopPullDownRefresh() //停止下拉刷新
},1000)
})
onLoad(() => {
getFonts() //启动使从服务器下载字体
})
@ -206,12 +216,14 @@ const onChooseAvatar = (e) => {
url: baseUrl + '/file/uploadFile',
filePath: tempFile,
name: 'file',
formData: {
biz: 'user_avatar'
},
header: {
cookie
},
success: (res) => {
myAvatar.value = JSON.parse(res.data).data.url
console.log(myAvatar.value)
myAvatar.value = JSON.parse(res.data).data
updateMyUser()
},
fail: (e) => {

8
pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue
View File

@ -136,6 +136,7 @@
import emitter from '../../../utils/emitter';
import { myOrderUrl } from '../../../common/globalImagesUrl.js';
import { publicPath } from '../../../common/globalImagesUrl.js';
import { onPullDownRefresh } from '@dcloudio/uni-app';
const bkgUrl = ref(myOrderUrl + '/myGeneralOrderDetail/bkg.png')
const order = ref({})
const cookie = wx.getStorageSync('cookie')
@ -161,6 +162,13 @@
getOrderById(orderId)
})
onPullDownRefresh( async ()=>{ //下拉刷新
await getOrderById(orderId)
setTimeout(()=>{
uni.stopPullDownRefresh() //停止下拉刷新
},1000)
})
const getOrderById = async (val) => {

17
pages/my-order/myOrderList/myOrderList.vue
View File

@ -133,6 +133,7 @@
import { getFonts } from '../../../common/globalFont';
import { myOrderUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
import { onPullDownRefresh } from '@dcloudio/uni-app';
const color = ref(new Array(5).fill('#323232'))
const point = ref(0)
const isShowUnderLine = ref([true, false, false, false, false])
@ -164,6 +165,7 @@
status.value = options.status
})
onMounted(() => {
color.value[0] = '#e79ea1'
if (!JudgeIsNullity(status.value)) {
@ -171,11 +173,24 @@
} else {
getMyOrder()
}
emitter.on('flushOrderList', flushOrderList)
})
onPullDownRefresh( async ()=>{ //下拉刷新
color.value[0] = '#e79ea1'
if (!JudgeIsNullity(status.value)) {
getMyStatusOrder(Number(status.value))
} else {
getMyOrder()
}
emitter.on('flushOrderList', flushOrderList)
setTimeout(()=>{
uni.stopPullDownRefresh() //停止下拉刷新
},1000)
})
onUnmounted(() => {
emitter.off('flushOrderList', flushOrderList)
})

7
pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue
View File

@ -118,6 +118,7 @@
import { getFonts } from '../../../common/globalFont';
import { myOrderUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
import { onPullDownRefresh } from '@dcloudio/uni-app';
const bkgUrl = ref(myOrderUrl + '/photoProductDetail/bkg.png')
const cookie = wx.getStorageSync('cookie')
let orderId = ''
@ -141,6 +142,12 @@
getOrderById(orderId)
})
onPullDownRefresh( async ()=>{ //下拉刷新
await getOrderById(orderId)
setTimeout(()=>{
uni.stopPullDownRefresh() //停止下拉刷新
},1000)
})
const getOrderById = async (val) => {
const res = await uni.request({

1
pages/order/singleGoodOrder/singleGoodOrder.vue
View File

@ -265,6 +265,7 @@ const updateAddressHandler = (val) => {
coupon.value.open('bottom')
}
const getMyCouponList = async () => {
const res = await uni.request({
url: baseUrl + '/coupon/list/use',

49
pages/workshop/index/index.vue
View File

@ -45,55 +45,30 @@
<script setup>
import { ref , onMounted } from 'vue'
import { baseUrl } from '../../../api/request';
import { onLoad,onPullDownRefresh } from "@dcloudio/uni-app";
import { onLoad } from "@dcloudio/uni-app";
import { getFonts } from '../../../common/globalFont';
import { workshopUrl } from '../../../common/globalImagesUrl';
import { publicPath } from '../../../common/globalImagesUrl';
import { onPullDownRefresh } from '@dcloudio/uni-app';
import carousel from '@/components/vear-carousel/vear-carousel'
const products = ref()
const cookie = wx.getStorageSync("cookie")
const bkgUrl = ref(workshopUrl + '/index/bkg.png')
const carouseList = ref([]) //轮播图
const imgList = ref([]) //轮播图展示图
onLoad(() => {
getFonts()
})
onMounted(()=>{
getProducts()
getCarouseList()
})
onPullDownRefresh( async ()=>{
getProducts()
getCarouseList()
onPullDownRefresh( async ()=>{ //下拉刷新
await getProducts()
setTimeout(()=>{
uni.stopPullDownRefresh() //停止下拉刷新
}, 1000)
})
const getCarouseList = async () => {
const res = await uni.request({
url: baseUrl + '/banner/query',
method: 'POST',
header: {
cookie
},
data: {
type: '服务类'
}
})
console.log('轮播图---->',res.data);
if(res.data.code === 1) {
carouseList.value = res.data.data
carouseList.value.forEach((item)=>{
imgList.value.push({
url: publicPath + item.url
})
})
}
}
const getProducts = async ()=> {
const res = await uni.request({
url: baseUrl + '/goods/service/list/card',
@ -112,6 +87,20 @@ const jump_detail =(item,index)=>{
}
const imgList = ref([{
url: workshopUrl + '/index/banner1.png',
id: 1
},{
url: workshopUrl + '/index/banner2.png',
id: 2
},{
url: workshopUrl + '/index/banner3.png',
id: 3
},{
url: workshopUrl + '/index/banner4.png',
id: 4
},])