From a4d0bc8177c1e98fbcecf3f6e0cb1a49f76f65d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Thu, 30 May 2024 14:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E4=B8=8B?=
=?UTF-8?q?=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
framework/0-conf.js | 11 +++++------
pages.json | 1 -
pages/index/index.vue | 8 ++++----
pages/member/index.vue | 2 +-
pages/product/index.vue | 26 +++++---------------------
pages/user/user.vue | 22 +++++++++++++++-------
6 files changed, 30 insertions(+), 40 deletions(-)
diff --git a/framework/0-conf.js b/framework/0-conf.js
index 6c036a7..d437536 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -6,8 +6,8 @@ const proxyApi = "/api"
// const proxyApi = 'http://192.168.2.42:9889/cashierService' // 王伟
// const proxyApi = 'http://192.168.2.74:9888/cashierService' // 帆哥
// const proxyApiwws = 'ws://192.168.2.74:9888/cashierService' // 测试
-const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试
-const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
+// const baseUrl = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试
+// const baseUrlwws ='wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
// #endif
@@ -16,10 +16,9 @@ const baseUrl = debug ? proxyApi : "https://wxcashiertest.sxczgkj.cn/cashierServ
const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService'
// #endif
// #ifdef APP || MP-WEIXIN
-const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService'// 线上
-const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/cashierService' // 线上
-// const baseUrl = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试
-// const baseUrlwws ='wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
+const baseUrl = 'https://cashier.sxczgkj.cn/cashierService'// 线上
+const baseUrlwws = 'wss://cashier.sxczgkj.cn/cashierService' // 线上
+
// #endif
// import VConsole from "./vConsole.js"
diff --git a/pages.json b/pages.json
index 1dbad33..a552af5 100644
--- a/pages.json
+++ b/pages.json
@@ -121,7 +121,6 @@
"style": {
"navigationBarTitleText": "个人中心",
"navigationBarBackgroundColor": "#FFD158",
- "navigationBarTextStyle": "white",
"navigationStyle": "custom"
}
}, {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e502de5..ef6b408 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -50,7 +50,7 @@
-
+
@@ -60,7 +60,7 @@
-
+
@@ -258,7 +258,7 @@
quilt: ''
}, //下拉点击的数据
form: {
- address: '西安市', //地址
+ address: '', //地址
type: '', //品类
orderBy: '', //1.理我最近 2.销量优先 3.价格优先
other: '', //附近1KM 1选中 0不选中
@@ -388,7 +388,7 @@
this.seighT = data.windowHeight;
this.$u.getRect('.fourcontent').then(res => {
console.log(res.top)
- this.Topdistance = res.top - res.height - 22 //滚动距离
+ this.Topdistance = res.top - res.height //滚动距离
})
}
})
diff --git a/pages/member/index.vue b/pages/member/index.vue
index 4101f25..c8c3e09 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -283,7 +283,7 @@
text-align: center;
background: #FFFFFF;
border-radius: 8rpx;
- border: 1rpx solid #333333;
+ // border: 1rpx solid #333333;
font-size: 28rpx;
font-family: Roboto-Medium, Roboto;
font-weight: 500;
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 863e3f0..4908d2f 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -141,27 +141,11 @@
{{listdata.purchaseNotice.refundPolicy || '无'}}
-
+
使用规则
-
- 不可使用包间
- 本单发票由商家提供，详情请咨询商家
- 堂食外带均可
- 1.购买：本券购买后，无需复制券码，进入书亦烧仙草小APP/
- 程序【我的-兑换卡券】点击【获取美团券】即可。
- 2.使用：请登录书亦烧仙草APP/小程序,选择对应商品，结算时
- 券会自动抵扣。
- 3.限1件商品使用，不可抵扣配送费、奶油等附加费用，如遇门
- 店原料不足无法供应时，或售罄，您可视情况更换核销门店或
- 退款处理。
- 4.适用范围：部分门店不可用，最终已下单时系统结算为准。
- 5.售后服务：如有疑问请致电400-888-1717。
- 团购用户可享受店内其他所有优惠
- 使用优惠券购买团单，有效期以优惠券规则为准
- 每人每天最多购买2张美团券
- 无需预约，消费高峰期可能需要等位
+
@@ -403,7 +387,7 @@
// 通用门店
productgeneralstore(name) {
uni.navigateTo({
- url:'/pages/product/generalstore?name=' + encodeURIComponent(JSON.stringify(name))
+ url: '/pages/product/generalstore?name=' + encodeURIComponent(JSON.stringify(name))
})
},
goMap(d) {
@@ -1119,9 +1103,8 @@
}
.classshowpopupitem {
- margin-top: 32rpx;
-
.classshowpopupitemone {
+ margin-top: 32rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 32rpx;
@@ -1129,6 +1112,7 @@
}
.classshowpopupitemtow {
+ margin-top: 16rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 24rpx;
diff --git a/pages/user/user.vue b/pages/user/user.vue
index e67be35..9c97dce 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -37,8 +37,8 @@
src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/user/kf.png" mode="aspectFill">
-
+
@@ -72,11 +72,10 @@
userInfo: {},
teblist: [],
list: [],
- Topdistance: ''
+ Topdistance: '',
};
},
- onLoad() {
- },
+ onLoad() {},
computed: {
HeighT() { //手机类型的尺寸
return this.$store.getters.is_BarHeight
@@ -90,6 +89,14 @@
}, 1000)
// 当组件挂载完成后获取距离
+ },
+ onPageScroll(e) {
+ if (e.scrollTop <= 44) { //搜索导航栏
+ this.opacity = false
+ } else {
+ this.opacity = true
+ }
+
},
onShow() {
if (uni.cache.get('token')) {
@@ -114,10 +121,10 @@
this.Topdistance = res.height //滚动距离
})
},
- memberlist(){
+ memberlist() {
if (uni.cache.get('token')) {
uni.pro.navigateTo('member/list')
- }else{
+ } else {
this.loginClick()
}
},
@@ -312,6 +319,7 @@
.boxtop_top {
padding: 0 32rpx;
margin-top: 52rpx;
+
.boxtop_topleft {
.flex-start {
text {