diff --git a/order/editeval/editeval.vue b/order/editeval/editeval.vue index ff2628e..6756d63 100644 --- a/order/editeval/editeval.vue +++ b/order/editeval/editeval.vue @@ -3,102 +3,85 @@ - 商品评价 0/2 + 商品评价 {{count}}/{{evalList.length}} 一键好评 匿名 - - - - - - - 泡椒田鸡 - - 差评 - 一般 - 好评 - - - - - - - - - - - - - - - - - - - 添加图片 - - - - - - - - - - - - 泡椒田鸡 - - 差评 - 一般 - 好评 + + - 提交 + 提交 diff --git a/order/orderDetail/style.scss b/order/orderDetail/style.scss index f702671..61fcc3e 100644 --- a/order/orderDetail/style.scss +++ b/order/orderDetail/style.scss @@ -90,12 +90,21 @@ page{ } } .cont_shop_text{ + width: 330rpx; margin-left: 20rpx; .cont_shop_title{ font-size: 28rpx; color: #333333; font-weight: 500; } + .cont_shop_title text{ + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + word-break: break-all; + } .cont_shop_price{ color: #333333; font-size: 26rpx; @@ -229,26 +238,63 @@ page{ display: flex; justify-content: space-between; align-items: center; - padding-top: 20rpx; - padding-left: 25rpx; - padding-right: 25rpx; + padding-left: 20rpx; + padding-right: 20rpx; border-top: 1rpx solid #efefef; .footer_l{ - color: #666666; - font-size: 28rpx; - width: 150rpx; - padding-top: 20rpx; - padding-bottom: 20rpx; + padding: 20rpx 0rpx 20rpx 0rpx; + position: relative; + .more_text{ + color: #666666; + font-size: 28rpx; + padding: 20rpx 0rpx 20rpx 0rpx; + display: flex; + align-items: center; + } + .more_open{ + position: absolute; + left: -10rpx; + z-index: 9999; + top: -130rpx; + .more_j{ + width: 0; + height: 0; + margin-left: 25rpx; + width: 0; + height: 0; + border-left: 15rpx solid transparent; + border-right: 15rpx solid transparent; + border-top: 15rpx solid #333333; + margin-top: -2rpx; + } + .more_cont{ + background-color: #333333; + border-radius: 10rpx; + padding: 0rpx 20rpx 0rpx 20rpx; + .more_item{ + font-size: 26rpx; + color: #FFFFFF; + height: 65rpx; + display: flex; + align-items: center; + justify-content: center; + width: 125rpx; + } + .more_border{ + border-bottom: 1rpx solid #999999; + } + } + } } .footer_r{ display: flex; .footer_btn{ - padding: 13rpx 30rpx 13rpx 30rpx; + padding: 13rpx 25rpx 13rpx 25rpx; border-radius: 50rpx; border: 1rpx solid #999999; - font-size: 28rpx; + font-size: 23rpx; color: #333333; - margin-left: 20rpx; + margin-left: 10rpx; } .footer_btn_bcg{ border: 1rpx solid #FD3F3F; @@ -257,4 +303,11 @@ page{ } } } +} +.openShow{ + position: fixed; + width: 100%; + top: 0; + z-index: 99; + height: 100vh; } \ No newline at end of file diff --git a/order/orderList/orderList.vue b/order/orderList/orderList.vue index 7b3e128..c698b3e 100644 --- a/order/orderList/orderList.vue +++ b/order/orderList/orderList.vue @@ -7,7 +7,7 @@ - + @@ -18,196 +18,51 @@ - - 已完成 - 2025/1/15 17:20 周三 + + {{item.orderStatus}} + {{item.createTime}} - + - - - - - - - - - - - - - - - - - - - - - + - 共3件、 实付:485 + 共{{item.totalNum}}件、 实付:{{item.payPrice}} - 更多 - - 申请售后 - 再来一单 - - - - - 已完成 - 2025/1/15 17:20 周三 - - - - - + + + 更多 + + + + 分享 + 删除订单 + - - - - 共3件、 实付:485 - - 更多 + + - 申请售后 + 取消订单 + 确认收货 + 去评价 + 申请售后 再来一单 - - 已完成 - 2025/1/15 17:20 周三 - - - - - - - - - - 共3件、 实付:485 - - 更多 - - 申请售后 - 再来一单 - - - - - 已完成 - 2025/1/15 17:20 周三 - - - - - - - - - - 共3件、 实付:485 - - 更多 - - 申请售后 - 再来一单 - - - - - 已完成 - 2025/1/15 17:20 周三 - - - - - - - - - - 共3件、 实付:485 - - 更多 - - 申请售后 - 再来一单 - - - - - 已完成 - 2025/1/15 17:20 周三 - - - - - - - - - - 共3件、 实付:485 - - 更多 - - 申请售后 - 再来一单 - - - - - 已完成 - 2025/1/15 17:20 周三 - - - - - - - - - - 共3件、 实付:485 - - 更多 - - 申请售后 - 再来一单 - - - - - 已完成 - 2025/1/15 17:20 周三 - - - - - - - - - - 共3件、 实付:485 - - 更多 - - 申请售后 - 再来一单 - + + + + {{decs}} + {{decs}} + @@ -216,6 +71,7 @@ import { ref,computed } from 'vue'; import { useCounterStore } from '@/store/counter'; // 引入 Pinia Store import { storeToRefs } from 'pinia';//实现解构付值 import { onLoad,onShow,onPullDownRefresh,onReachBottom } from "@dcloudio/uni-app" +import { orderlist,ordercancel,orderdel,ordertake } from "@/server/api.js" const counterStore = useCounterStore(); // 使用 Store //使用pinia：storeToRefs方法包裹(保持响应式更新，不使用视图无法更新) const {statusHeight,headerHeight,statusBartop,ButtonWidth,ButtonHeight } = storeToRefs(counterStore); @@ -223,21 +79,27 @@ const navList = ref(['全部','待支付','备货中','待收货','待评价']); const active = ref(0); // 定义响应式数据，存储页面宽度 const pageWidth = ref(0); +const shop_orderlist = ref([]); +const decs = ref(''); +const pages = ref(0); +const limits = ref(10); +const type = ref(""); +const img_err = ref(""); +const show_id = ref({}); +const openShow = ref(false); // 获取页面宽度 const updatePageWidth = () => { const systemInfo = uni.getSystemInfoSync(); pageWidth.value = systemInfo.windowWidth; }; - const searchWidth = computed(() => { return pageWidth.value - statusHeight.value - ButtonWidth.value - 35; }); -const assDetail=()=>{ +const assDetail=(item)=>{ uni.navigateTo({ url:`/order/assedit/assedit` }) }; - // 判断是否有上一页 const getPages = () => { const pages = getCurrentPages(); @@ -254,37 +116,202 @@ const handleBack = () => { }); } }; -const clickOrder=(index)=>{ - if(index == 4){ - uni.navigateTo({ - url:`/order/orderevallist/orderevallist?type=0` - }) - return false - } - active.value = index; -} -const orderDetail=()=>{ +const evaluate = (item) =>{ + // uni.navigateTo({ + // url:`/order/orderevallist/orderevallist?type=0` + // }) uni.navigateTo({ - url:`/order/orderDetail/orderDetail` + url:`/order/editeval/editeval?orderNo=${item.orderId}` + }) +} +//显示更多 +const more_arr = (type,e) =>{ + if(type == 1){ + show_id.value = {id:e.id}; + openShow.value = !openShow.value + shop_orderlist.value.forEach(item => { + if(e.id == item.id){ + item.openShow = true; + }else{ + item.openShow = false; + } + }) + }else{ + show_id.value = {}; + openShow.value = false + shop_orderlist.value.forEach(item => { + if(e.id == item.id){ + item.openShow = false; + } + }) + } + +} +const clickOrder=(index)=>{ + if(active.value == index) return false; + active.value = index; + shop_orderlist.value = []; + decs.value = ''; + pages.value = 0; + if(index == 1){ + type.value = "0" + }else if(index == 2){ + type.value = "5" + }else if(index == 3){ + type.value = "2" + }else if(index == 4){ + type.value = "3" + }else{ + type.value = ""; + } + api_orderlist(); +} +const orderDetail=(item)=>{ + uni.navigateTo({ + url:`/order/orderDetail/orderDetail?orderId=${item.orderId}` }) }; - +const api_orderlist=()=>{ + pages.value = pages.value + 1; + img_err.value = ""; + decs.value = "—— 加载中... ——"; + const params = { + type:type.value, + page:pages.value, + limit:limits.value + } + return orderlist(params).then(({data}) => { + decs.value = '—— 上拉加载更多 ——'; + data.list.forEach(item => { + item.openShow = false; + }) + shop_orderlist.value = shop_orderlist.value.concat(data.list); + if(pages.value == 1 && !data.list.length){ + img_err.value = "../../static/Empty/order_lisr_img.png" + decs.value = "—— 暂无订单记录 ——" + }else if(data.list.length < 10){ + decs.value = '—— 嗷呜，已经到底啦 ——'; + } + }).catch(({message}) => { + img_err.value = "../../static/Empty/err.png" + decs.value = `—— ${message} ——`; + }) +} +//确认收货 +const confirmReceipt = (item)=>{ + ordertake(item.id).then(({message}) => { + uni.showToast({ + title:message, + icon:'success', + success: () => { + setTimeout(()=>{ + shop_orderlist.value = []; + decs.value = ''; + pages.value = 0; + api_orderlist(); + },1400) + } + }) + }).catch(({message}) => { + uni.showModal({ + content:message, + showCancel: false + }) + }) +} +//删除订单 +const remove = (item)=>{ + uni.showModal({ + content:"您确定要删除当前订单吗？", + confirmText:'确定', + confirmColor:'#F14D48', + success: ({confirm}) => { + if (confirm) { + orderdel(item.id).then(({message}) => { + uni.showToast({ + title:message, + icon:'success', + success: () => { + setTimeout(()=>{ + shop_orderlist.value = []; + decs.value = ''; + pages.value = 0; + api_orderlist(); + },1400) + } + }) + }).catch(({message}) => { + uni.showModal({ + content:message, + showCancel: false + }) + }) + } + } + }) +} +//取消订单 +const cancel = (item)=>{ + uni.showModal({ + content:"您确定要取消当前订单吗？", + confirmText:'确定', + confirmColor:'#F14D48', + success: ({confirm}) => { + if (confirm) { + ordercancel(item.id).then(({message}) => { + uni.showToast({ + title:message, + icon:'success', + success: () => { + setTimeout(()=>{ + shop_orderlist.value = []; + decs.value = ''; + pages.value = 0; + api_orderlist(); + },1400) + } + }) + }).catch(({message}) => { + uni.showModal({ + content:message, + showCancel: false + }) + }) + } + } + }) +} //使用 uni.onLoad 监听页面加载 onLoad((options) => { - const { type } = options; - if(type == 0 || type == 1 || type == 2 || type == 3 || type == 4 ){ - active.value = type; + if(options.type){ + active.value = options.type; + }else{ + active.value = 0; } + if(options.type == 1){ + type.value = "0" + }else if(options.type == 2){ + type.value = "5" + }else if(options.type == 3){ + type.value = "2" + }else if(options.type == 4){ + type.value = "3" + }else{ + type.value = ""; + } + api_orderlist(); updatePageWidth(); }); -onShow(() => { - -}); +onShow(() => {}); onPullDownRefresh(()=>{ + shop_orderlist.value = []; + decs.value = ''; + pages.value = 0; + api_orderlist(); uni.stopPullDownRefresh(); }) onReachBottom(()=>{ - + api_orderlist(); }) diff --git a/order/orderList/style.scss b/order/orderList/style.scss index 3fa5d1f..8d5fd5d 100644 --- a/order/orderList/style.scss +++ b/order/orderList/style.scss @@ -95,7 +95,7 @@ page{ margin: 20rpx 20rpx 0 20rpx; background-color: #FFFFFF; border-radius: 16rpx; - padding: 0 25rpx 0 25rpx; + padding: 0 20rpx 0 20rpx; box-shadow: 0 4rpx 8rpx rgba(0,0,0,.05); .order_type{ font-size: 34rpx; @@ -182,15 +182,56 @@ page{ justify-content: space-between; padding: 25rpx 0 25rpx 0; .order_l{ - color: #333333; - font-size: 26rpx; + width: 90rpx; + height: 55rpx; + position: relative; + .more_text{ + color: #333333; + font-size: 28rpx; + height: 55rpx; + display: flex; + align-items: center; + } + .more_open{ + position: absolute; + left: -10rpx; + z-index: 9999; + top: 55rpx; + .more_j{ + width: 0; + height: 0; + border-left: 15rpx solid transparent; + border-right: 15rpx solid transparent; + border-bottom: 15rpx solid #333333; + margin-left: 18rpx; + } + .more_cont{ + background-color: #333333; + border-radius: 10rpx; + padding: 0rpx 20rpx 0rpx 20rpx; + margin-top: -2rpx; + .more_item{ + font-size: 26rpx; + color: #FFFFFF; + height: 65rpx; + display: flex; + align-items: center; + justify-content: center; + width: 125rpx; + } + .more_border{ + border-bottom: 1rpx solid #999999; + } + } + } } .order_r{ display: flex; justify-content: flex-end; .order_btn{ - width: 158rpx; - height: 64rpx; + padding-left: 23rpx; + padding-right: 21rpx; + height: 55rpx; background: #FFFFFF; border-radius: 33rpx; border: 1rpx solid #D9D9D9; @@ -198,18 +239,13 @@ page{ align-items: center; justify-content: center; color: #999999; - font-size: 26rpx; - margin-left: 25rpx; + font-size: 23rpx; + margin-left: 10rpx; } .order_bcg{ - width: 158rpx; - height: 64rpx; background: #FF0000; border-radius: 33rpx; border: 1rpx solid #FF0000; - display: flex; - align-items: center; - justify-content: center; color: #ffffff; font-size: 26rpx; } @@ -217,4 +253,52 @@ page{ } } } +} +.load_desc{ + font-size: 28rpx; + color: #aaa; + text-align: center; + padding-top: 30rpx; + padding-bottom: 30rpx; +} +.empty{ + height:480rpx; + margin:200rpx 20rpx 0rpx 20rpx; + border-radius: 20rpx; + display: flex; + align-items: center; + justify-content: center; + .empty_cont{ + .empty_cont_img{ + margin: 0 auto; + width: 355rpx; + height: 280rpx; + display: flex; + } + .empty_cont_title{ + font-size: 28rpx; + color: #aaaaaa; + text-align: center; + } + .empty_cont_btn{ + margin: 0 auto; + width: 154rpx; + height: 46rpx; + border-radius: 30rpx; + border: 1rpx solid #FF0000; + color: #FF0000; + line-height: 30rpx; + display: flex; + align-items: center; + justify-content: center; + margin-top: 40rpx; + } + } +} +.openShow{ + position: fixed; + width: 100%; + top: 0; + z-index: 99; + height: 100vh; } \ No newline at end of file diff --git a/pages/user/style.scss b/pages/user/style.scss index 2c60ac8..4b5b7d4 100644 --- a/pages/user/style.scss +++ b/pages/user/style.scss @@ -148,7 +148,11 @@ page{ } } .user_cont_li_left_boder{ - box-shadow: -10rpx 0 10rpx -5rpx rgba(244, 244, 244, 0.8); /* 左边框阴影 */ + // box-shadow: -10rpx 0 10rpx -5rpx rgba(244, 244, 244, 0.8); /* 左边框阴影 */ + background-image: url("../../static/order/2168_03.jpg"); + background-repeat: no-repeat; /* 防止重复 */ + background-position: left center; /* 水平靠左，垂直居中 */ + background-size: auto 100%; /* 宽度自适应，高度填满 */ } } .price::before { diff --git a/server/api.js b/server/api.js index 776969a..154f51c 100644 --- a/server/api.js +++ b/server/api.js @@ -127,11 +127,147 @@ export const citylist = (data) => { export const deliverytimes = (data) => { return request({url:`/api/front/delivery/times`,method:'GET',data}); } +//计算订单价格 +export const computedprice = (data) => { + return request({url:`/api/front/order/computed/price`,method:'POST',data}); +} +//创建订单 +export const ordercreate = (data) => { + return request({url:`/api/front/order/create`,method:'POST',data}); +} +//获取支付配置 +export const payconfig = (data) => { + return request({url:`/api/front/order/get/pay/config`,method:'GET',data}); +} +//订单列表 +export const orderlist = (data) => { + return request({url:`/api/front/order/list`,method:'GET',data}); +} +//订单详情 +export const orderdetail = (orderId) => { + return request({url:`/api/front/order/detail/${orderId}`,method:'GET'}); +} +//删除订单 +export const orderdel = (id) => { + return request({url:`/api/front/order/del?id=${id}`,method:'POST',contenttype:'x-www-form-urlencoded'}); +} +//订单取消 +export const ordercancel = (id) => { + return request({url:`/api/front/order/cancel?id=${id}`,method:'POST',contenttype:'x-www-form-urlencoded'}); +} +//订单头部数量 +export const orderdata = (data) => { + return request({url:`/api/front/order/data`,method:'GET',data}); +} +//订单支付 +export const paypayment = (data) => { + return request({url:`/api/front/pay/payment`,method:'POST',data}); +} +//查询支付结果 +export const payqueryPayResult = (data) => { + return request({url:`/api/front/pay/queryPayResult`,method:'GET',data}); +} +//评价订单 +export const orderReplycomment = (data) => { + return request({url:`/api/front/order/orderReply/comment`,method:'POST',data}); +} +//评论中心-列表 +export const orderReplylist = (data) => { + return request({url:`/api/front/order/orderReply/list`,method:'GET',data}); +} +//待评价商品信息查询 +export const orderReplyproduct = (data) => { + return request({url:`/api/front/order/orderReply/product`,method:'POST',data}); +} +//订单收货 +export const ordertake = (id) => { + return request({url:`/api/front/order/take?id=${id}`,method:'POST',contenttype:'x-www-form-urlencoded'}); +} +//修改订单 +export const orderupdateOrder = (data) => { + return request({url:`/api/front/order/updateOrder`,method:'POST',data}); +} +//退款/售后-售后记录 +export const returnapplyRecordsList = (data) => { + return request({url:`/api/front/return/applyRecordsList`,method:'GET',data}); +} +//退款/售后-售后申请列表 +export const returncanApplyOrderList = (data) => { + return request({url:`/api/front/return/canApplyOrderList`,method:'GET',data}); +} +//获取退款计算 +export const returncomputedPrice = (data) => { + return request({url:`/api/front/return/computedPrice`,method:'POST',data}); +} +//售后记录详情 +export const returngetApplyRecord = (id) => { + return request({url:`/api/front/return/getApplyRecord/${id}`,method:'GET'}); +} +//获取申请订单退款信息 +export const returngetOrder = (orderId) => { + return request({url:`/api/front/return/getOrder/${orderId}`,method:'GET'}); +} +//订单退款申请 +export const returnreturnApply = (data) => { + return request({url:`/api/front/return/returnApply`,method:'POST',data}); +} //我的优惠券 export const couponlist = (data) => { return request({url:`/api/front/coupon/list`,method:'GET',data}); } -//计算订单价格 -export const computedprice = (data) => { - return request({url:`/api/front/order/computed/price`,method:'POST',data}); -} \ No newline at end of file +//当前订单可用优惠券 +export const couponsorder = (preOrderNo) => { + return request({url:`/api/front/coupons/order/${preOrderNo}`,method:'GET'}); +} +//优惠券分页列表 +export const frontcoupons = (data) => { + return request({url:`/api/front/coupons`,method:'GET',data}); +} +//新人注册券 +export const frontnewUserCoupon = (data) => { + return request({url:`/api/front/newUserCoupon`,method:'GET',data}); +} +//领券 +export const couponreceive = (data) => { + return request({url:`/api/front/coupon/receive`,method:'POST',data}); +} +//图片上传 +export const uploadimage = (data) => { + return request({url:`/api/front/user/upload/image`,method:'POST',data}); +} +//添加收藏产品 +export const collectadd = (data) => { + return request({url:`/api/front/collect/add`,method:'POST',data}); +} +//批量收藏 +export const collectall = (data) => { + return request({url:`/api/front/collect/all`,method:'POST',data}); +} +//取消收藏产品(通过商品) +export const collectcancel = (proId,data) => { + return request({url:`/api/front/collect/cancel/${proId}`,method:'POST',data}); +} +//取消收藏产品 +export const collectdelete = (data) => { + return request({url:`/api/front/collect/delete`,method:'POST',data}); +} +//我的收藏列表 +export const collectuser = (data) => { + return request({url:`/api/front/collect/user`,method:'GET',data}); +} +//个人中心-用户信息 +export const frontuser = (data) => { + return request({url:`/api/front/user`,method:'GET',data}); +} +//修改个人资料 +export const useredit = (data) => { + return request({url:`/api/front/user/edit`,method:'POST',data}); +} +//热门搜索 +export const searchkeyword = (data) => { + return request({url:`/api/front/search/keyword`,method:'GET',data}); +} +//分享配置 +export const frontshare = (data) => { + return request({url:`/api/front/share`,method:'GET',data}); +} diff --git a/server/config.js b/server/config.js index 088a36e..ce4ec06 100644 --- a/server/config.js +++ b/server/config.js @@ -9,7 +9,7 @@ const type = 'dev' * prod生产 */ if(type === 'dev'){ - url = "http://xx2qui.natappfree.cc"; + url = "http://yz29xy.natappfree.cc"; } if(type === 'test'){ url = "https://japiuat.3721zh.com/webapp"; diff --git a/static/Empty/Mask group@2x (9).png b/static/Empty/err.png similarity index 100% rename from static/Empty/Mask group@2x (9).png rename to static/Empty/err.png diff --git a/static/Empty/Mask group@2x (8).png b/static/Empty/order_lisr_img.png similarity index 100% rename from static/Empty/Mask group@2x (8).png rename to static/Empty/order_lisr_img.png diff --git a/static/eval/good.png b/static/eval/good.png index dbae869..02ac848 100644 Binary files a/static/eval/good.png and b/static/eval/good.png differ diff --git a/static/eval/good_aver.png b/static/eval/good_aver.png new file mode 100644 index 0000000..dbae869 Binary files /dev/null and b/static/eval/good_aver.png differ diff --git a/static/eval/negative.png b/static/eval/negative.png index f476335..9889fb5 100644 Binary files a/static/eval/negative.png and b/static/eval/negative.png differ diff --git a/static/eval/negative_aver.png b/static/eval/negative_aver.png index 9889fb5..f476335 100644 Binary files a/static/eval/negative_aver.png and b/static/eval/negative_aver.png differ diff --git a/static/eval/ordinary_aver.png b/static/eval/ordinary_aver.png new file mode 100644 index 0000000..8f29486 Binary files /dev/null and b/static/eval/ordinary_aver.png differ diff --git a/static/order/2168_03.jpg b/static/order/2168_03.jpg new file mode 100644 index 0000000..2fd489f Binary files /dev/null and b/static/order/2168_03.jpg differ diff --git a/uni_modules/uni-data-select/changelog.md b/uni_modules/uni-data-select/changelog.md new file mode 100644 index 0000000..8ec0ce7 --- /dev/null +++ b/uni_modules/uni-data-select/changelog.md @@ -0,0 +1,41 @@ +## 1.0.9（2025-03-26） +- 优化 默认背景为白色与整体组件保持风格统一 +## 1.0.8（2024-03-28） +- 修复 在vue2下:style动态绑定导致编译失败的bug +## 1.0.7（2024-01-20） +- 修复 长文本回显超过容器的bug，超过容器部分显示省略号 +## 1.0.6（2023-04-12） +- 修复 微信小程序点击时会改变背景颜色的 bug +## 1.0.5（2023-02-03） +- 修复 禁用时会显示清空按钮 +## 1.0.4（2023-02-02） +- 优化 查询条件短期内多次变更只查询最后一次变更后的结果 +- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue +## 1.0.3（2023-01-16） +- 修复 不关联服务空间报错的问题 +## 1.0.2（2023-01-14） +- 新增 属性 `format` 可用于格式化显示选项内容 +## 1.0.1（2022-12-06） +- 修复 当where变化时，数据不会自动更新的问题 +## 0.1.9（2022-09-05） +- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框 +## 0.1.8（2022-08-29） +- 修复 点击的位置不准确 +## 0.1.7（2022-08-12） +- 新增 支持 disabled 属性 +## 0.1.6（2022-07-06） +- 修复 pc端宽度异常的bug +## 0.1.5 +- 修复 pc端宽度异常的bug +## 0.1.4（2022-07-05） +- 优化 显示样式 +## 0.1.3（2022-06-02） +- 修复 localdata 赋值不生效的 bug +- 新增 支持 uni.scss 修改颜色 +- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用） +## 0.1.2（2022-05-08） +- 修复 当 value 为 0 时选择不生效的 bug +## 0.1.1（2022-05-07） +- 新增 记住上次的选项（仅 collection 存在时有效） +## 0.1.0（2022-04-22） +- 初始化 diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue new file mode 100644 index 0000000..686c1d0 --- /dev/null +++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue @@ -0,0 +1,561 @@ + + + + + diff --git a/uni_modules/uni-data-select/package.json b/uni_modules/uni-data-select/package.json new file mode 100644 index 0000000..d18e611 --- /dev/null +++ b/uni_modules/uni-data-select/package.json @@ -0,0 +1,88 @@ +{ + "id": "uni-data-select", + "displayName": "uni-data-select 下拉框选择器", + "version": "1.0.9", + "description": "通过数据驱动的下拉框选择器", + "keywords": [ + "uni-ui", + "select", + "uni-data-select", + "下拉框", + "下拉选" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "^3.1.1" + }, + "directories": { + "example": "../../temps/example_temps" + }, +"dcloudext": { + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", + "type": "component-vue" + }, + "uni_modules": { + "dependencies": ["uni-load-more"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y", + "alipay": "n" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "n", + "app-harmony": "u", + "app-uvue": "u" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "u", + "百度": "u", + "字节跳动": "u", + "QQ": "u", + "京东": "u" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/uni_modules/uni-data-select/readme.md b/uni_modules/uni-data-select/readme.md new file mode 100644 index 0000000..eb58de3 --- /dev/null +++ b/uni_modules/uni-data-select/readme.md @@ -0,0 +1,8 @@ +## DataSelect 下拉框选择器 +> **组件名：uni-data-select** +> 代码块： `uDataSelect` + +当选项过多时，使用下拉菜单展示并选择内容 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 diff --git a/uni_modules/uni-load-more/changelog.md b/uni_modules/uni-load-more/changelog.md new file mode 100644 index 0000000..667abdb --- /dev/null +++ b/uni_modules/uni-load-more/changelog.md @@ -0,0 +1,25 @@ +## 1.3.6（2024-10-15） +- 修复 微信小程序中的getSystemInfo警告 +## 1.3.5（2024-10-12） +- 修复 微信小程序中的getSystemInfo警告 +## 1.3.4（2024-10-12） +- 修复 微信小程序中的getSystemInfo警告 +## 1.3.3（2022-01-20） +- 新增 showText属性 ，是否显示文本 +## 1.3.2（2022-01-19） +- 修复 nvue 平台下不显示文本的bug +## 1.3.1（2022-01-19） +- 修复 微信小程序平台样式选择器报警告的问题 +## 1.3.0（2021-11-19） +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more) +## 1.2.1（2021-08-24） +- 新增 支持国际化 +## 1.2.0（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.1.8（2021-05-12） +- 新增 组件示例地址 +## 1.1.7（2021-03-30） +- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug +## 1.1.6（2021-02-05） +- 调整为uni_modules目录规范 diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json new file mode 100644 index 0000000..a4f14a5 --- /dev/null +++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json @@ -0,0 +1,5 @@ +{ + "uni-load-more.contentdown": "Pull up to show more", + "uni-load-more.contentrefresh": "loading...", + "uni-load-more.contentnomore": "No more data" +} diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js new file mode 100644 index 0000000..de7509c --- /dev/null +++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js @@ -0,0 +1,8 @@ +import en from './en.json' +import zhHans from './zh-Hans.json' +import zhHant from './zh-Hant.json' +export default { + en, + 'zh-Hans': zhHans, + 'zh-Hant': zhHant +} diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json new file mode 100644 index 0000000..f15d510 --- /dev/null +++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json @@ -0,0 +1,5 @@ +{ + "uni-load-more.contentdown": "上拉显示更多", + "uni-load-more.contentrefresh": "正在加载...", + "uni-load-more.contentnomore": "没有更多数据了" +} diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json new file mode 100644 index 0000000..a255c6d --- /dev/null +++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json @@ -0,0 +1,5 @@ +{ + "uni-load-more.contentdown": "上拉顯示更多", + "uni-load-more.contentrefresh": "正在加載...", + "uni-load-more.contentnomore": "沒有更多數據了" +} diff --git a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue new file mode 100644 index 0000000..a203417 --- /dev/null +++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue @@ -0,0 +1,404 @@ + + + + + diff --git a/uni_modules/uni-load-more/package.json b/uni_modules/uni-load-more/package.json new file mode 100644 index 0000000..cf44bff --- /dev/null +++ b/uni_modules/uni-load-more/package.json @@ -0,0 +1,84 @@ +{ + "id": "uni-load-more", + "displayName": "uni-load-more 加载更多", + "version": "1.3.6", + "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。", + "keywords": [ + "uni-ui", + "uniui", + "加载更多", + "load-more" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, +"dcloudext": { + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", + "type": "component-vue" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y", + "alipay": "n" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/uni_modules/uni-load-more/readme.md b/uni_modules/uni-load-more/readme.md new file mode 100644 index 0000000..54dc1fa --- /dev/null +++ b/uni_modules/uni-load-more/readme.md @@ -0,0 +1,14 @@ + + +### LoadMore 加载更多 +> **组件名：uni-load-more** +> 代码块： `uLoadMore` + + +用于列表中，做滚动加载使用，展示 loading 的各种状态。 + + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 + +