diff --git a/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.acss b/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.acss index eadc654..792c2e0 100644 --- a/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.acss +++ b/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.acss @@ -87,10 +87,9 @@ height: 20px; .Box2 { width: 100%; - height: 150px; + height: 130px; background-color: white; - position: relative; - top:30px; + margin-top: 50rpx; border-radius: 15px; } /* 店铺名 */ @@ -107,33 +106,31 @@ height: 20px; } .z3{ position: relative; - left: 30rpx; - bottom: 8rpx; + left: 20rpx; color: rgb(194, 53, 53); } .z4{ position: relative; - left: 80rpx; - bottom:10rpx; + left: 50rpx; } /* 营业时间 */ .z6{ color: #4095E5; font-weight: bolder; - top:20px; - left: 10px; - position: relative; + margin-left: 20rpx; } .z7{ - position: relative; - top:38rpx; - left: 30rpx; + display: flex; + width: 300px; + margin-left: 10rpx; font-size: 13px; + margin-top: 3rpx; } .box3{ width: 100%; height: 1px; background-color: darkgrey; + margin-top: 10rpx; } /* 地址 */ .z8{ @@ -223,4 +220,8 @@ height: 20px; position: absolute; right: 0rpx; top: -40rpx; +} +.time{ + width: 100%; + display: flex; } \ No newline at end of file diff --git a/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.axml b/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.axml index 7eb6f91..778319f 100644 --- a/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.axml +++ b/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.axml @@ -5,9 +5,9 @@ {{businessName}} + defaultValue="{{level}}" + readonly + > {{level}}.0 500条 @@ -20,23 +20,21 @@ - - - 已休息 - 营业中 - 营业时间:{{startBusiness}}-{{endBusiness}} + + + 已休息 + 营业中 + + 营业时间:{{startBusiness}}-{{endBusiness}} + - - - - - - {{address}} + - + + {{address}} - + diff --git a/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.js b/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.js index 23788cc..4e82bb2 100644 --- a/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.js +++ b/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.js @@ -43,7 +43,7 @@ Page({ showComments: false, // 控制评论部分是否显示 showBusinessInfo: false, // 控制商家信息是否显示 pingjia:[], - level:'' + level:'', }, onLoad(options) { // Extract userId and address from options @@ -57,7 +57,7 @@ Page({ const id = options.id const businessPhone = options.businessPhone const level = options.level - console.log(id,'这是店铺id吗'); + console.log(id,storeStatus,'这是店铺id吗'); // Set them in data for use in the page this.setData({ userId: userId, diff --git a/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.acss b/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.acss index 4f6f4a7..2852a35 100644 --- a/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.acss +++ b/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.acss @@ -84,11 +84,10 @@ height: 20px; .Box2 { width: 100%; - height: 150px; + height: 130px; background-color: white; - position: relative; - top:30px; border-radius: 15px; + margin-top: 50rpx; } /* 店铺名 */ .z2{ @@ -117,20 +116,17 @@ height: 20px; .z6{ color: #4095E5; font-weight: bolder; - top:20px; - left: 10px; - position: relative; + margin-left: 20rpx; } .z7{ - position: relative; - top:38rpx; - left: 30rpx; + margin-left: 10rpx; font-size: 13px; } .box3{ width: 100%; height: 1px; background-color: darkgrey; + margin-top: 10rpx; } /* 地址 */ .z8{ @@ -219,4 +215,8 @@ height: 20px; position: absolute; right: 0rpx; top: -40rpx; +} +.time{ + width: 100%; + display: flex; } \ No newline at end of file diff --git a/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.axml b/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.axml index 5f2e599..6f06270 100644 --- a/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.axml +++ b/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.axml @@ -20,23 +20,21 @@ - - - 已休息 - 营业中 - 营业时间:{{startBusiness}}-{{endBusiness}} + + + 已休息 + 营业中 + + 营业时间:{{startBusiness}}-{{endBusiness}} + - - - - - - {{address}} + - + + {{address}} - + diff --git a/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.js b/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.js index e1b0f9f..8fe6aa5 100644 --- a/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.js +++ b/甲情_甲意/miniprogram/pages/shnagmendianpu/shnagmendianpu.js @@ -58,7 +58,7 @@ Page({ const id = options.id const businessPhone = options.businessPhone const level = options.level - console.log(id,'这是店铺id吗'); + console.log(storeStatus,id,'这是店铺id吗'); // Set them in data for use in the page this.setData({ userId: userId, diff --git a/甲情_甲意/miniprogram/pages/wodeshoucang/wodeshoucang.js b/甲情_甲意/miniprogram/pages/wodeshoucang/wodeshoucang.js index 0996ad5..70bd152 100644 --- a/甲情_甲意/miniprogram/pages/wodeshoucang/wodeshoucang.js +++ b/甲情_甲意/miniprogram/pages/wodeshoucang/wodeshoucang.js @@ -211,10 +211,15 @@ Page({ const startBusiness = id.data.startBusiness const storeStatus = id.data.storeStatus const businessPhone =id.data.businessPhone - console.log('Address being passed: ', ID,address,businessName,businessAvatar,endBusiness,startBusiness,businessPhone); + const level = id.data.level + console.log('Address being passed: ', level,ID,address,businessName,businessAvatar,endBusiness,startBusiness,businessPhone); my.navigateTo({ - url: `/pages/dianpuzhuye/dianpuzhuye?userId=${userId}&&address=${address}&&businessName=${businessName}&&businessAvatar=${businessAvatar}&&startBusiness=${startBusiness}&&endBusiness=${endBusiness}&&storeStatus=${storeStatus}&&id=${ID}&&businessPhone=${businessPhone}`, + url: `/pages/dianpuzhuye/dianpuzhuye?userId=${userId} + &&address=${address}&&businessName=${businessName} + &&businessAvatar=${businessAvatar}&&startBusiness=${startBusiness} + &&endBusiness=${endBusiness}&&storeStatus=${storeStatus} + &&id=${ID}&&businessPhone=${businessPhone}&&level=${level}`, }); } }); diff --git a/甲情_甲意/miniprogram/pages/zixunmeijiashi/zixunmeijiashi.js b/甲情_甲意/miniprogram/pages/zixunmeijiashi/zixunmeijiashi.js index e6572d0..94a540d 100644 --- a/甲情_甲意/miniprogram/pages/zixunmeijiashi/zixunmeijiashi.js +++ b/甲情_甲意/miniprogram/pages/zixunmeijiashi/zixunmeijiashi.js @@ -15,6 +15,16 @@ Page({ this.setData({ chatMessages: [initialMessage] }); + my.getStorage({ + key: 'userInfo', + success: (res) => { + const userInfo = res.data; + this.setData({ + id: userInfo.id, // 获取 id + avatarUrl:userInfo.avatarUrl + }); + } + }); }, onMessageInput(e) { @@ -28,16 +38,6 @@ Page({ }, onSubmit() { - my.getStorage({ - key: 'userInfo', - success: (res) => { - const userInfo = res.data; - this.setData({ - id: userInfo.id, // 获取 id - avatarUrl:userInfo.avatarUrl - }); - } - }); let that = this; let currentMessage = this.data.message; let userAvatar = this.data.avatarUrl; // 用户头像URL