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
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..29b325442 100644
--- a/yudao-ui-app/pages/index/index.vue
+++ b/yudao-ui-app/pages/index/index.vue
@@ -24,19 +24,31 @@
-
-
+
+
会员等级1级
- 查看权益
+ 查看权益
+
+
+
+
+
+ 会员等级0级
+ 申请会员
@@ -82,10 +94,7 @@
{{item.storeName}}
-
-
-
-
+
@@ -260,6 +269,7 @@
page: 1,
limit: 10,
},
+ vip: {},//会员
tempArr: [], //精品推荐临时数组
roll: [], // 新闻简报
site_name: '', //首页title
@@ -333,7 +343,8 @@
})
})
getHeader().then(res => {
- console.log(res, '会员')
+ this.vip = res.data
+ console.log(this.vip, '会员')
})
this.getBanners()
this.getIndexPage()
@@ -349,9 +360,25 @@
})
},
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.switchTab({
+ url:'/pages/member_equity/index'
+ })
+ },
// 跳转公告详情
goNoticeDetail() {
- console.log('notice哇')
uni.navigateTo({
url: '/pages/notice/index'
})
@@ -390,8 +417,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 +948,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 +991,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 +1039,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