diff --git a/common/js/api.js b/common/js/api.js index cf40f43..614eb8f 100644 --- a/common/js/api.js +++ b/common/js/api.js @@ -111,6 +111,10 @@ export default { orderfindWiningUser(data) { //获取免单订单 return uni.api.get("/order/findWiningUser", data); }, + // 获取自己的免单订单 + ordermineWinner(data) { + return uni.api.get("/order/mineWinner", data); + }, indexlist(data) { //商品列表(今日上新/热榜/咖啡饮品) return uni.api.get("/distirict/productCate", data, false); }, diff --git a/pages/index/components/category.vue b/pages/index/components/category.vue index 2d76607..e7255d2 100644 --- a/pages/index/components/category.vue +++ b/pages/index/components/category.vue @@ -4,8 +4,7 @@ @click="viewHistorycategoryss(item,index)" :class="!item.isChild && viewHistoryindex == index ? 'fourcontent_itemactev':''"> {{item.name}} - + diff --git a/pages/index/components/todaylist.vue b/pages/index/components/todaylist.vue index 9f12c29..7f9e786 100644 --- a/pages/index/components/todaylist.vue +++ b/pages/index/components/todaylist.vue @@ -18,7 +18,8 @@ - {{item.productName}} + {{item.productName.length>5?item.productName.substring(0,5)+'...':item.productName}} @@ -27,7 +28,7 @@ {{item.discount || '1'}}折 - + ￥{{item.salePrice}} ￥{{item.originPrice}} @@ -58,12 +59,12 @@ TOP.{{index + 1}} - {{item.productName}} + {{ item.productName.length>5?item.productName.substring(0,5)+'...':item.productName }} 已抢{{item.realSalesNumber}}份 - + ￥{{item.salePrice}} ￥{{item.originPrice}} @@ -126,7 +127,8 @@ width: 336rpx; border-radius: 18rpx; background: #FFFFFF; - height:396rpx; + height: 396rpx; + .therecontent_box_itembox { padding: 10rpx 18rpx 24rpx 24rpx; @@ -204,11 +206,11 @@ } .therecontent_box_itembox_itemviewthere { - margin-top: 4rpx; + // margin-top: 4rpx; // align-items: flex-end; - // display: flex; - // align-items: center; - // justify-content: center; + display: flex; + align-items: center; + justify-content: center; text:nth-child(1) { font-family: Source Han Sans CN, Source Han Sans CN; @@ -223,7 +225,7 @@ font-size: 16rpx; color: #999999; text-decoration-line: line-through; - margin-top: 10rpx; + margin-top: 4rpx; } } } diff --git a/pages/index/freedaily.vue b/pages/index/freedaily.vue index 2ac488a..96b8f98 100644 --- a/pages/index/freedaily.vue +++ b/pages/index/freedaily.vue @@ -28,7 +28,7 @@ - 订单数：82 + 订单数：{{total}} @@ -43,7 +43,7 @@ 免单状态 - + {{item.orderAmount}}元 @@ -97,6 +97,7 @@ titlename: '', opacity: false, orderfindWiningUserlist: [], + ordermineWinnerList: [], form: { address: '', //地址 type: '', //品类 @@ -106,10 +107,12 @@ size: 10, //页容量 status: 'loadmore' }, + total:0 }; }, onLoad(e) { this.orderfindWiningUser() + this.ordermineWinnerEvent() let _this = this uni.getStorage({ key: 'itemData', @@ -118,6 +121,9 @@ } }); }, + onReachBottom() { + this.ordermineWinnerEvent() + }, onPageScroll(e) { if (e.scrollTop <= 44) { //搜索导航栏 this.opacity = false @@ -133,7 +139,22 @@ return str.slice(start, end + 1); //slice方法截取的部分不包括第二参数所在位置 }, - + async ordermineWinnerEvent() { + let res = await this.api.ordermineWinner({ + userId: uni.cache.get('userInfo').id, + page: this.form.page, + size: this.form.size + }) + if(res.code ==0){ + this.total = res.data.total + if(this.form.page==1){ + this.ordermineWinnerList = res.data.list + }else{ + this.ordermineWinnerList.push(...res.data.list) + } + this.form.page = ++this.form.page; + } + }, async orderfindWiningUser() { let res = await this.api.orderfindWiningUser() this.orderfindWiningUserlist = res.data.map((i) => { diff --git a/pages/index/index.vue b/pages/index/index.vue index efe8456..f6a6859 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -54,8 +54,8 @@ - {{item.name}} - {{item.name}} + @@ -74,7 +74,7 @@ {{item.shopName}} - {{item.districts}}{{item.distances}} + {{item.districts}} {{item.distances}} @@ -92,8 +92,8 @@ - - {{item.productName}} + + {{item.productName.length>7?item.productName.substring(0,7)+'...':item.productName}} 已抢{{item.realSalesNumber}}份 @@ -128,7 +128,7 @@ :day="item.end_times.d" :hour="item.end_times.h" :minute="item.end_times.m" :second="item.end_times.s" :indexs='index' color="#FFFFFF" border-color="#00B26A" - splitorColor="#FFFFFF" :font-size="8"> + splitorColor="#FFFFFF" :font-size="10"> @@ -183,7 +183,7 @@ :key="index" @click="viewHistory(item,index)" :class="!item.isChild && viewHistoryindex == index ? 'fourcontent_itemactev':''"> {{item.name}} - @@ -679,7 +679,7 @@ border-radius: 34rpx; font-family: Source Han Sans CN, Source Han Sans CN; font-weight: 400; - font-size: 28rpx; + font-size: 20rpx; color: #999999; overflow: hidden; //超出的文本隐藏 text-overflow: ellipsis; //溢出用省略号显示 @@ -695,11 +695,10 @@ padding: 32rpx 28rpx; overflow-x: auto; flex-wrap: nowrap; - .fourcontent_item { flex-wrap: nowrap; margin-left: 22rpx; - padding: 8rpx 28rpx; + padding: 11rpx 31rpx; background: #FFFFFF; border-radius: 8rpx 8rpx 8rpx 8rpx; @@ -851,7 +850,7 @@ } view { - width: 300rpx; + // width: 300rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; //溢出不换行white-space:nowrap; //溢出不换行 diff --git a/pages/login/login.vue b/pages/login/login.vue index 4d8134b..1f10dec 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -2,8 +2,9 @@ - - + + + 手机号码 @@ -52,7 +53,7 @@ - 阅读并同意{{uni.cache.set('NAME', '零点八零')}} + 阅读并同意零点八零 《用户协议》 及 《隐私政策》 diff --git a/pages/login/register.vue b/pages/login/register.vue index 78e0750..fc3afd7 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -2,7 +2,7 @@ 您好， - 欢迎使用{{uni.cache.set('NAME', '零点八零')}} + 欢迎使用零点八零 diff --git a/pages/product/index.vue b/pages/product/index.vue index 655026a..34d9c77 100644 --- a/pages/product/index.vue +++ b/pages/product/index.vue @@ -184,7 +184,7 @@ 首页 - + 客服 @@ -383,6 +383,9 @@ //#endif }, methods: { + eeInfoindex(){ + uni.pro.switchTab('index/index') + }, overlayshowsboxs(e) { // this.cartshping = e // this.overlayshow = true diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue index 209abfb..bf2b78f 100644 --- a/pages/product/placeOrder.vue +++ b/pages/product/placeOrder.vue @@ -27,7 +27,7 @@ - + @@ -140,7 +140,7 @@ width: 750rpx; background: #FFFFFF; border-radius: 16rpx 16rpx 16rpx 16rpx; - padding: 30rpx; + padding: 20rpx 30rpx; .placetopone { .df(space-between); @@ -209,21 +209,18 @@ } .jiesuanmoney { - height: 112rpx; - line-height: 112rpx; + height: 50rpx; + line-height: 50rpx; text-align: right; + margin-top: 8rpx; >text:first-child { font-size: 24rpx; - - } >text:last-child { font-size: 32rpx; margin-left: 20rpx; - - } } diff --git a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue index 1e28dda..0566808 100644 --- a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue +++ b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue @@ -133,7 +133,7 @@ color, backgroundColor, fontSize: `${fontSize}px`, - width: `${fontSize * 22 / 14}px`, // 按字体大小为 14px 时的比例缩放 + width: `${fontSize * 16 / 14}px`, // 按字体大小为 14px 时的比例缩放 lineHeight: `${fontSize * 20 / 14}px`, borderRadius: `${fontSize * 3 / 14}px`, }