From 15a30885a7f3bbdebfa9e61fbcfdf2fa844d6219 Mon Sep 17 00:00:00 2001 From: js199000126 <528892601@qq.com> Date: Fri, 26 May 2023 11:39:43 +0800 Subject: [PATCH 1/4] navbar --- yudao-ui-app/config/app.js | 4 +- yudao-ui-app/libs/order.js | 7 ++ yudao-ui-app/pages/goods_details/index.vue | 2 +- yudao-ui-app/pages/index/index.vue | 65 ++++++++++++------- .../pages/order_addcart/order_addcart.vue | 14 +++- 5 files changed, 64 insertions(+), 28 deletions(-) diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js index 605d8d33c..06c5429ab 100644 --- a/yudao-ui-app/config/app.js +++ b/yudao-ui-app/config/app.js @@ -1,6 +1,6 @@ -let domain = process.env.APP_BASE_URL -// let domain = 'http://192.168.1.188:48080' +// let domain = process.env.APP_BASE_URL +let domain = 'http://192.168.1.188:48080' // let domain = 'http://api.cyywl.top' module.exports = { diff --git a/yudao-ui-app/libs/order.js b/yudao-ui-app/libs/order.js index 92ffabde5..096809e04 100644 --- a/yudao-ui-app/libs/order.js +++ b/yudao-ui-app/libs/order.js @@ -7,6 +7,7 @@ import util from 'utils/util' * 去商品详情 */ export function goShopDetail(item, uid) { + console.log(item,'indexItem哇') return new Promise(resolve => { if (item.activityH5 && item.activityH5.type === "1") { uni.navigateTo({ @@ -25,6 +26,12 @@ export function goShopDetail(item, uid) { } }); } +export function goShopDetailCart(item, uid) { + console.log(item,'itemWWw阿') + return new Promise(resolve => { + resolve(item); + }); +} /** * 活动商品、普通商品、购物车、再次购买预下单 diff --git a/yudao-ui-app/pages/goods_details/index.vue b/yudao-ui-app/pages/goods_details/index.vue index 93635dd6d..247bd0960 100644 --- a/yudao-ui-app/pages/goods_details/index.vue +++ b/yudao-ui-app/pages/goods_details/index.vue @@ -206,7 +206,7 @@ - + diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue index 219a9a2d3..6e2c6dfd6 100644 --- a/yudao-ui-app/pages/index/index.vue +++ b/yudao-ui-app/pages/index/index.vue @@ -24,19 +24,30 @@ - - + + 会员等级1级 - 查看权益 + 查看权益 + + + + + + 会员等级0级 + 申请会员 - - - + @@ -82,10 +93,7 @@ {{item.storeName}} - - - - + @@ -260,6 +268,7 @@ page: 1, limit: 10, }, + vip: {},//会员 tempArr: [], //精品推荐临时数组 roll: [], // 新闻简报 site_name: '', //首页title @@ -333,7 +342,8 @@ }) }) getHeader().then(res => { - console.log(res, '会员') + this.vip = res.data + console.log(this.vip, '会员') }) this.getBanners() this.getIndexPage() @@ -349,9 +359,15 @@ }) }, methods: { + // 跳转会员权益 + goEquity(){ + console.log('goEmember_equity') + uni.navigateTo({ + url:'/pages/member_equity/index' + }) + }, // 跳转公告详情 goNoticeDetail() { - console.log('notice哇') uni.navigateTo({ url: '/pages/notice/index' }) @@ -390,8 +406,9 @@ // console.log(this.$store.tenantId,'tenantId') getBanner().then(res => { - this.bannerList = res.data.list[0] - console.log(this.bannerList, 'banner') + this.bannerList = [...res.data.list] + console.log(res.data.list,'banner') + }) console.log(this.userInfo.userId, 'userInfo111111') @@ -920,18 +937,18 @@ .bottom { margin-top: 27rpx; height: 200rpx; - overflow: scroll; - white-space: nowrap; + display: flex; + flex-wrap: nowrap; .item { position: relative; display: inline-block; - width: 370rpx; + width: 45%; height: 199rpx; margin-left: 19rpx; image { - width: 370rpx; + width: 100%; height: 199rpx; } @@ -963,16 +980,16 @@ position: absolute; left: 17rpx; top: 81rpx; - width: 166rpx; - height: 71rpx; + width: 120rpx; + height: 62rpx; } .img2 { position: absolute; top: 22rpx; right: 25rpx; - width: 138rpx; - height: 132rpx; + width: 116rpx; + height: 104rpx; } } } @@ -1011,8 +1028,10 @@ color: #000000; } - text { + .text { position: absolute; + display: flex; + justify-content: flex-end !important; right: 20rpx; bottom: 14rpx; font-size: 28rpx; diff --git a/yudao-ui-app/pages/order_addcart/order_addcart.vue b/yudao-ui-app/pages/order_addcart/order_addcart.vue index 44f2028ef..2142bc556 100644 --- a/yudao-ui-app/pages/order_addcart/order_addcart.vue +++ b/yudao-ui-app/pages/order_addcart/order_addcart.vue @@ -20,7 +20,7 @@ - + {{item.storeName}} @@ -186,7 +186,7 @@ }; }, computed: { - ...mapGetters(['isLogin']), + ...mapGetters(['isLogin', 'uid']), reChecked() { return item => { return item.checked @@ -263,6 +263,16 @@ }; }, methods: { + // 商品详情页跳转 + goDetail(item) { + if (item.activityH5 && item.activityH5.type === "2" && !this.isLogin) { + toLogin(); + } else { + uni.navigateTo({ + url: `/pages/goods_details/index?id=${item.productId}` + }) + } + }, // 全选 allCheck() { this.isAllSelect = !this.isAllSelect From b10de0ca81c9b7fa4f83e6f9ed232dad34482732 Mon Sep 17 00:00:00 2001 From: js199000126 <528892601@qq.com> Date: Fri, 26 May 2023 13:48:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=95=86=E5=9F=8E-=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/pages/index/index.vue | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue index 6e2c6dfd6..29b325442 100644 --- a/yudao-ui-app/pages/index/index.vue +++ b/yudao-ui-app/pages/index/index.vue @@ -24,7 +24,7 @@ - + @@ -32,11 +32,11 @@ 查看权益 - + 会员等级0级 - 申请会员 + 申请会员 @@ -47,6 +47,7 @@ height="100%" radius="20rpx" bgColor="transparent" + @click="goUrl" > @@ -359,10 +360,20 @@ }) }, methods: { + + goUrl(e){ + let url = '' + if(this.bannerList[e].url.indexOf('http')>=0){ + url = this.bannerList[e].url + }else{ + url = 'http://' + this.bannerList[e].url + } + window.open(url) + }, // 跳转会员权益 goEquity(){ console.log('goEmember_equity') - uni.navigateTo({ + uni.switchTab({ url:'/pages/member_equity/index' }) }, From 4f9bb936b49d7573629c8279a578c67c385782ad Mon Sep 17 00:00:00 2001 From: js199000126 <528892601@qq.com> Date: Fri, 26 May 2023 13:49:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=95=86=E5=9F=8E-=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/config/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js index 06c5429ab..605d8d33c 100644 --- a/yudao-ui-app/config/app.js +++ b/yudao-ui-app/config/app.js @@ -1,6 +1,6 @@ -// let domain = process.env.APP_BASE_URL -let domain = 'http://192.168.1.188:48080' +let domain = process.env.APP_BASE_URL +// let domain = 'http://192.168.1.188:48080' // let domain = 'http://api.cyywl.top' module.exports = { From 64158be5704016a73e219bc9c7a7491783057306 Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Fri, 26 May 2023 13:50:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-prod.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml index 87f3a7fa6..c2f92cfe7 100644 --- a/yudao-server/src/main/resources/application-prod.yaml +++ b/yudao-server/src/main/resources/application-prod.yaml @@ -235,10 +235,10 @@ wx: useRedis: false defaultContent: \u60A8\u597D\uFF0C\u6709\u4EC0\u4E48\u95EE\u9898\uFF1F redisConfig: - host: 117.33.142.185 # 地址 - port: 6369 # 端口 + host: 47.109.92.244 # 地址 + port: 6399 # 端口 database: 16 # 数据库索引 - password: 20221122@dev # 密码，建议生产环境开启 + password: cyywl123.. # 密码，建议生产环境开启 phone: query-url: http://cy-phone-bill-inquiry-server:4006/cyywl-phone-query-api/ token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0 \ No newline at end of file