From 46e91a1e89a8f19223ab77e9dc4d2464dd9e5593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Tue, 16 Jul 2024 15:37:13 +0800 Subject: [PATCH] 2024.7.16 --- .gitignore | 3 +- App.vue | 70 +- common/js/api.js | 22 +- components/navseat.vue | 30 +- framework/0-conf.js | 2 +- pages.json | 28 +- pages/chooseasong/index.vue | 651 +++++++++++++++++- pages/chooseasong/record.vue | 237 +++++++ pages/index/indexs - 副本.vue | 283 ++++++++ pages/index/indexs.vue | 242 +++---- pages/order/order.vue | 10 +- pages/order_food/goodsList.vue | 92 +++ pages/order_food/goodsList_scroll.vue | 391 +++++++++++ pages/order_food/goodsList_swiper.vue | 323 +++++++++ pages/order_food/order_food - 副本.vue | 378 ++++++---- pages/order_food/order_food.vue | 14 +- store/index.js | 2 + .../components/u-notice-bar/u-notice-bar.vue | 2 +- .../components/u-row-notice/u-row-notice.vue | 4 +- 19 files changed, 2397 insertions(+), 387 deletions(-) create mode 100644 pages/chooseasong/record.vue create mode 100644 pages/index/indexs - 副本.vue create mode 100644 pages/order_food/goodsList.vue create mode 100644 pages/order_food/goodsList_scroll.vue create mode 100644 pages/order_food/goodsList_swiper.vue diff --git a/.gitignore b/.gitignore index 165c177..f7a5435 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/unpackage \ No newline at end of file +/unpackage +node_modules/ \ No newline at end of file diff --git a/App.vue b/App.vue index 2102825..4e44428 100644 --- a/App.vue +++ b/App.vue @@ -8,75 +8,7 @@ }, onShow: function() { this.$store.dispatch("HeightActions"); //获取随时获取页面的高度 - // console.log('App Show'); - try { - // #ifdef APP-PLUS - // uni.getSystemInfo({ - // success: (res) => { - // let system = res; - // if (system.platform == 'ios') { - // console.log('ios', 64); - // uni.request({ - // url: uni.conf.baseUrl + '/api/systemConfig/updateSystemVersion?platformCode=' + 1, - // method: 'POST', - // // header: { - // // userId: uni.getStorageSync('userId'), - // // token: uni.getStorageSync('token'), - // // myLoginName: uni.getStorageSync('myLoginName') - // // }, - // success: (res) => { - // let datares = res.data; - // // uni.showToast({ - // // title: res.message || res.msg, - // // icon: "none", - // // }) - // // console.log(datares, '11111111') - // if (datares.code == 200) { - // uni.is_update = datares.data.versionCode; //是版本号，判断是否升级 - // uni.is_force = datares.data.forceUpdate; //是否强制更新 1：强制 0：未强制 - // uni.versionName = datares.data.versionName; //是版本号 显示版本号 - // uni.is_wgt = 0; //是热更新 目前好像没有该功能 - // uni.updateUrlApp = datares.data.url; //是下载地址 - // uni.update_content = datares.data.updateInfo; //版本说明 - // // uni.pro.switchTab('index/index'); - // } - // }, - // fail: (res) => { - // // uni.showToast({ - // // title: res.message || res.msg, - // // icon: "none", - // // }) - // } - // }); - // } else { - // console.log(res, 66); - // uni.request({ - // url: uni.conf.baseUrl + '/api/systemConfig/updateSystemVersion?platformCode=' + 0, - // method: 'POST', - // // header: { - // // userId: uni.getStorageSync('userId'), - // // token: uni.getStorageSync('token'), - // // myLoginName: uni.getStorageSync('myLoginName') - // // }, - // success: (res) => { - // let datares = res.data; - // console.log(res); - // if (datares.code == 200) { - // uni.is_update = datares.data.versionCode; //是版本号，判断是否升级 - // uni.is_force = datares.data.forceUpdate; //是否强制更新 1：强制 0：未强制 - // uni.versionName = datares.data.versionName; //是版本号 显示版本号 - // uni.is_wgt = 0; //是热更新 目前好像没有该功能 - // uni.updateUrlApp = datares.data.url; //是下载地址 - // uni.update_content = datares.data.updateInfo; //版本说明 - // // uni.pro.switchTab('index/index'); - // } - // } - // }); - // } - // } - // }); - // #endif - } catch (e) {} + }, onHide: function() { // console.log('App Hide'); diff --git a/common/js/api.js b/common/js/api.js index 911948e..9a327c3 100644 --- a/common/js/api.js +++ b/common/js/api.js @@ -6,7 +6,7 @@ export default { return uni.api.post("/login/app/login", data); }, productqueryProduct(data) { //获取商品信息 - return uni.api.post("/product/queryProduct", data,false); + return uni.api.post("/product/queryProduct", data, false); }, // 下单详情 getproductorderConfirm(data) { @@ -84,7 +84,7 @@ export default { return uni.api.get("/order/getYhqDouble", data); }, productqueryProductSku(data) { //通过选中的商品规格查询价格 - return uni.api.get("/product/queryProductSku", data,false); + return uni.api.get("/product/queryProductSku", data, false); }, logingetPhoneNumber(data) { //小程序获取手机号 return uni.api.post("/login/getPhoneNumber", data); @@ -167,6 +167,22 @@ export default { return uni.api.get("/pay/getShopByMember", data, false); }, loginmpdifyPwd(data) { // 修改资金密码 - return uni.api.get("login/mpdifyPwd", data); + return uni.api.get("/login/mpdifyPwd", data); }, + cashierServicesong(data) { // 获取所有歌曲，支持搜索及分页 + return uni.api.get("/song", data,false); + }, + cashierServicerecord(data) { // 点歌记录 + return uni.api.get("/song/record", data); + }, + cashierServicesongpost(data) { // 点歌 + return uni.api.post("/song", data); + }, + businessopenId(data) { // 获取openId + return uni.api.get("/login/wx/business/openId", data); + }, + songsinging(data) { // 获取正在演唱的歌曲 + return uni.api.get("/song/singing", data, false); + }, + } \ No newline at end of file diff --git a/components/navseat.vue b/components/navseat.vue index a58b46d..03c15e5 100644 --- a/components/navseat.vue +++ b/components/navseat.vue @@ -1,5 +1,5 @@ @@ -48,17 +50,29 @@ type: String, default: '' }, + namecolor: { + type: String, + default: '#333333' + }, opacity: { type: Boolean, default: false }, - titleshow: { + titleshow: {//标题是否显示 type: Boolean, default: false }, - iconshow: { + heightshow: {//是否要占位高度 + type: Boolean, + default: false + }, + iconshow: {//返回键是否显示 type: Boolean, default: true + }, + iconcolor:{//返回键颜色 + type: String, + default: '#000' } }, computed: { @@ -93,10 +107,11 @@ background: #F9F9F9; } - .content { + .navbarcontent { position: -webkit-sticky; position: sticky; top: 0; + left: 0; z-index: 9999; .active { @@ -168,7 +183,6 @@ font-family: Source Han Sans CN, Source Han Sans CN; font-weight: 400; font-size: 28rpx; - color: #333333; } } diff --git a/framework/0-conf.js b/framework/0-conf.js index 3b39958..a3d1a6f 100644 --- a/framework/0-conf.js +++ b/framework/0-conf.js @@ -16,7 +16,7 @@ const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService' // #endif // #ifdef APP || MP-WEIXIN -const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService' // 线上、、 +const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService' // 线上 const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/netty' // 线上 // const baseUrl = 'https://cashier.sxczgkj.cn/cashierService' // 线上 // const baseUrlwws = 'wss://cashier.sxczgkj.cn/netty' // 线上/ diff --git a/pages.json b/pages.json index 190de03..9bedad0 100644 --- a/pages.json +++ b/pages.json @@ -3,7 +3,8 @@ { "path": "pages/index/index", "style": { - "navigationStyle": "custom" + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { @@ -158,6 +159,20 @@ "navigationBarTextStyle": "white" } }, + { + "path": "pages/order_food/goodsList_scroll", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/order_food/goodsList_swiper", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, { "path": "pages/make/list", "style": { @@ -204,7 +219,16 @@ "path": "pages/chooseasong/index", "style": { "navigationBarTitleText": "歌曲列表", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "white", + "navigationStyle": "custom" + } + }, + { + "path": "pages/chooseasong/record", + "style": { + "navigationBarTitleText": "点单记录", + "navigationBarTextStyle": "white", + "navigationStyle": "custom" } }, { diff --git a/pages/chooseasong/index.vue b/pages/chooseasong/index.vue index 806a58f..5490534 100644 --- a/pages/chooseasong/index.vue +++ b/pages/chooseasong/index.vue @@ -1,36 +1,659 @@ - \ No newline at end of file diff --git a/pages/chooseasong/record.vue b/pages/chooseasong/record.vue new file mode 100644 index 0000000..f24cb61 --- /dev/null +++ b/pages/chooseasong/record.vue @@ -0,0 +1,237 @@ + + + + + \ No newline at end of file diff --git a/pages/index/indexs - 副本.vue b/pages/index/indexs - 副本.vue new file mode 100644 index 0000000..ca2a6a8 --- /dev/null +++ b/pages/index/indexs - 副本.vue @@ -0,0 +1,283 @@ + + + + + \ No newline at end of file diff --git a/pages/index/indexs.vue b/pages/index/indexs.vue index f91a50e..ba9eb2c 100644 --- a/pages/index/indexs.vue +++ b/pages/index/indexs.vue @@ -1,58 +1,40 @@ + + diff --git a/pages/order_food/goodsList_scroll.vue b/pages/order_food/goodsList_scroll.vue new file mode 100644 index 0000000..4aaa0b9 --- /dev/null +++ b/pages/order_food/goodsList_scroll.vue @@ -0,0 +1,391 @@ + + + + + \ No newline at end of file diff --git a/pages/order_food/goodsList_swiper.vue b/pages/order_food/goodsList_swiper.vue new file mode 100644 index 0000000..76c11f6 --- /dev/null +++ b/pages/order_food/goodsList_swiper.vue @@ -0,0 +1,323 @@ + + + + + diff --git a/pages/order_food/order_food - 副本.vue b/pages/order_food/order_food - 副本.vue index c5c78ad..ece93bb 100644 --- a/pages/order_food/order_food - 副本.vue +++ b/pages/order_food/order_food - 副本.vue @@ -12,11 +12,11 @@ - + - + @@ -89,12 +89,12 @@ - + {{ item1.cartNumber }} - + @@ -171,7 +171,7 @@ {{ shopList.storeInfo.businessTime }} - + {{ shopList.storeInfo.phone }} @@ -230,19 +230,23 @@ - + @@ -687,7 +703,7 @@ display: flex; align-items: center; justify-content: center; - margin-right: $paddingSize; + // margin-right: $paddingSize; } } } @@ -943,12 +959,23 @@ } .btn { + position: relative; padding: 6upx 10upx; background-color: $color-priamry; border-radius: 12upx; display: flex; align-items: center; justify-content: center; + + &::after { + content: ""; + position: absolute; + left: -10px; + top: -10px; + right: -10px; + bottom: -10px; + + } } } } @@ -1153,18 +1180,111 @@ } .btn { + position: relative; padding: 16upx 20upx; background-color: $color-priamry; border-radius: 12upx; display: flex; align-items: center; justify-content: center; + + &::after { + content: ""; + position: absolute; + left: -10px; + top: -10px; + right: -10px; + bottom: -10px; + + } } } } } + .classorderdetailshow { + position: relative; + + .orderdetailuicon { + position: absolute; + top: 10rpx; + left: 10rpx; + } + + .payType { + padding: 32rpx 34rpx; + margin-top: 48rpx; + background-color: #fff; + + >view:first-child { + font-weight: 500; + font-size: 28rpx; + color: #333333; + } + + >view:last-child { + margin-top: 32rpx; + } + + .dfs { + display: flex; + align-items: center; + } + + } + + .fixedview { + position: relative; + width: 100%; + + .flex-between { + width: 100%; + padding: 24rpx 28rpx; + background: #FFFFFF; + flex-wrap: nowrap; + + .fixedview_one { + .fixedview_oneone { + font-size: 28rpx; + font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold; + font-weight: normal; + color: #333333; + } + + .fixedview_onetow { + font-size: 44rpx; + font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold; + font-weight: normal; + color: #F45C4C; + font-weight: bold; + + text { + font-size: 28rpx; + } + } + + .fixedview_onethere { + font-family: Source Han Sans CN, Source Han Sans CN; + font-weight: 400; + font-size: 24rpx; + color: #999999; + } + } + + .fixedview_tow { + background: red; + border-radius: 34rpx; + padding: 10rpx 44rpx; + font-size: 32rpx; + font-family: PingFang SC-Bold, PingFang SC; + font-weight: bold; + color: #FFFFFF; + } + } + } + } + .shop-info-wrap { .info-wrap { padding: $paddingSize * 2 0; diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index ece93bb..9d1a99d 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -75,6 +75,9 @@ {{ item1.name }} + + {{ item1.suit }}起售 + ￥ @@ -104,7 +107,7 @@ - + diff --git a/uni_modules/uview-ui/components/u-row-notice/u-row-notice.vue b/uni_modules/uview-ui/components/u-row-notice/u-row-notice.vue index 20f43c3..6d62c84 100644 --- a/uni_modules/uview-ui/components/u-row-notice/u-row-notice.vue +++ b/uni_modules/uview-ui/components/u-row-notice/u-row-notice.vue @@ -3,7 +3,7 @@ class="u-notice" @tap="clickHandler" > - +