zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mall_product_new'

pull/2/head^2
perry 2023-05-26 13:50:29 +08:00
parent 5fd0973bf3 540caf9cc1
commit 664b5c9b4c
5 changed files with 76 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-server/src/main/resources/application-prod.yaml
View File

@ -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

7
yudao-ui-app/libs/order.js
View File

@ -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);
});
}
/**
* 活动商品、普通商品、购物车、再次购买预下单

2
yudao-ui-app/pages/goods_details/index.vue
View File

@ -206,7 +206,7 @@
<productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'>
</productWindow>
<home></home>
<!-- <home></home> -->
<couponListWindow :coupon='coupon' @ChangCouponsClone="ChangCouponsClone" @ChangCoupons="ChangCoupons"
@ChangCouponsUseState="ChangCouponsUseState" @tabCouponType="tabCouponType"></couponListWindow>
<!-- 分享按钮 -->

76
yudao-ui-app/pages/index/index.vue
View File

@ -24,19 +24,31 @@
</view>
</view>
</view>
<view class="right">
<view class="up">
<view class="right" v-if="vip.integral">
<view class="up" @tap="goEquity">
<image style="width: ;" src="@/static/images/shop/vip_oneStar.png" mode=""></image>
</view>
<text>会员等级1级</text>
<view class="button">查看权益</view>
<view class="button" @tap="goEquity">查看权益</view>
</view>
<view class="right" v-else>
<view class="up" @tap="goEquity">
<image style="width: ;" src="@/static/images/shop/vip_oneStar.png" mode=""></image>
</view>
<text>会员等级0级</text>
<view class="button" @tap="goEquity">申请会员</view>
</view>
</view>
</view>
<view class="header_bottom">
<navigator :url="bannerList.url">
<image :src="bannerList.picUrl" mode=""></image>
</navigator>
<u-swiper
:list="bannerList"
keyName="picUrl"
height="100%"
radius="20rpx"
bgColor="transparent"
@click="goUrl"
></u-swiper>
</view>
</view>
<view class="notice" @tap="goNoticeDetail">
@ -82,10 +94,7 @@
<view class="item" v-for="item in productList" @click="goDetail(item)">
<image :src="item.image" mode=""></image>
<view class="name">{{item.storeName}}</view>
<text>
<u--text color="#E50202" mode="price" :text="item.price"></u--text>
</text>
<u--text class="text" color="#E50202" mode="price" :text="item.price"></u--text>
</view>
</view>
<view class="" style="margin-top: 110rpx;">
@ -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;

14
yudao-ui-app/pages/order_addcart/order_addcart.vue
View File

@ -20,7 +20,7 @@
<view class="image">
<image :src="item.image" style="border-radius: 10rpx;"></image>
</view>
<view class="detail">
<view class="detail" @tap="goDetail(item)">
<view class="name">
{{item.storeName}}
</view>
@ -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