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

Compare commits

base: zenghuapei:f386fced2f0ab46bfb12fcd2e5634a40a2470533
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
..
compare: zenghuapei:93d971598486f259786ce01123d568d0eb763a7f
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

No commits in common. "f386fced2f0ab46bfb12fcd2e5634a40a2470533" and "93d971598486f259786ce01123d568d0eb763a7f" have entirely different histories.
f386fced2f ... 93d9715984

5 changed files with 28 additions and 75 deletions
Show Stats Expand all files Collapse all files

4
yudao-ui-app/config/app.js
View File

@ -1,6 +1,6 @@
// let domain = process.env.APP_BASE_URL let domain = process.env.APP_BASE_URL
let domain = 'http://192.168.1.188:48080' // let domain = 'http://192.168.1.188:48080'
// let domain = 'http://api.cyywl.top' // let domain = 'http://api.cyywl.top'
module.exports = { module.exports = {

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

@ -7,7 +7,6 @@ import util from 'utils/util'
* 去商品详情 * 去商品详情
*/ */
export function goShopDetail(item, uid) { export function goShopDetail(item, uid) {
console.log(item,'indexItem哇')
return new Promise(resolve => { return new Promise(resolve => {
if (item.activityH5 && item.activityH5.type === "1") { if (item.activityH5 && item.activityH5.type === "1") {
uni.navigateTo({ uni.navigateTo({
@ -26,12 +25,6 @@ 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" <productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'> @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'>
</productWindow> </productWindow>
<!-- <home></home> --> <home></home>
<couponListWindow :coupon='coupon' @ChangCouponsClone="ChangCouponsClone" @ChangCoupons="ChangCoupons" <couponListWindow :coupon='coupon' @ChangCouponsClone="ChangCouponsClone" @ChangCoupons="ChangCoupons"
@ChangCouponsUseState="ChangCouponsUseState" @tabCouponType="tabCouponType"></couponListWindow> @ChangCouponsUseState="ChangCouponsUseState" @tabCouponType="tabCouponType"></couponListWindow>
<!-- 分享按钮 --> <!-- 分享按钮 -->

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

@ -24,31 +24,19 @@
</view> </view>
</view> </view>
</view> </view>
<view class="right" v-if="vip.integral"> <view class="right">
<view class="up" @tap="goEquity"> <view class="up">
<image style="width: ;" src="@/static/images/shop/vip_oneStar.png" mode=""></image> <image style="width: ;" src="@/static/images/shop/vip_oneStar.png" mode=""></image>
</view> </view>
<text>会员等级1级</text> <text>会员等级1级</text>
<view class="button" @tap="goEquity">查看权益</view> <view class="button">查看权益</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>
</view> </view>
<view class="header_bottom"> <view class="header_bottom">
<u-swiper <navigator :url="bannerList.url">
:list="bannerList" <image :src="bannerList.picUrl" mode=""></image>
keyName="picUrl" </navigator>
height="100%"
radius="20rpx"
bgColor="transparent"
@click="goUrl"
></u-swiper>
</view> </view>
</view> </view>
<view class="notice" @tap="goNoticeDetail"> <view class="notice" @tap="goNoticeDetail">
@ -94,7 +82,10 @@
<view class="item" v-for="item in productList" @click="goDetail(item)"> <view class="item" v-for="item in productList" @click="goDetail(item)">
<image :src="item.image" mode=""></image> <image :src="item.image" mode=""></image>
<view class="name">{{item.storeName}}</view> <view class="name">{{item.storeName}}</view>
<u--text class="text" color="#E50202" mode="price" :text="item.price"></u--text>
<text>
<u--text color="#E50202" mode="price" :text="item.price"></u--text>
</text>
</view> </view>
</view> </view>
<view class="" style="margin-top: 110rpx;"> <view class="" style="margin-top: 110rpx;">
@ -269,7 +260,6 @@
page: 1, page: 1,
limit: 10, limit: 10,
}, },
vip: {},//会员
tempArr: [], //精品推荐临时数组 tempArr: [], //精品推荐临时数组
roll: [], // 新闻简报 roll: [], // 新闻简报
site_name: '', //首页title site_name: '', //首页title
@ -343,8 +333,7 @@
}) })
}) })
getHeader().then(res => { getHeader().then(res => {
this.vip = res.data console.log(res, '会员')
console.log(this.vip, '会员')
}) })
this.getBanners() this.getBanners()
this.getIndexPage() this.getIndexPage()
@ -360,25 +349,9 @@
}) })
}, },
methods: { 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() { goNoticeDetail() {
console.log('notice哇')
uni.navigateTo({ uni.navigateTo({
url: '/pages/notice/index' url: '/pages/notice/index'
}) })
@ -417,9 +390,8 @@
// console.log(this.$store.tenantId,'tenantId') // console.log(this.$store.tenantId,'tenantId')
getBanner().then(res => { getBanner().then(res => {
this.bannerList = [...res.data.list] this.bannerList = res.data.list[0]
console.log(res.data.list,'banner') console.log(this.bannerList, 'banner')
}) })
console.log(this.userInfo.userId, 'userInfo111111') console.log(this.userInfo.userId, 'userInfo111111')
@ -948,18 +920,18 @@
.bottom { .bottom {
margin-top: 27rpx; margin-top: 27rpx;
height: 200rpx; height: 200rpx;
display: flex; overflow: scroll;
flex-wrap: nowrap; white-space: nowrap;
.item { .item {
position: relative; position: relative;
display: inline-block; display: inline-block;
width: 45%; width: 370rpx;
height: 199rpx; height: 199rpx;
margin-left: 19rpx; margin-left: 19rpx;
image { image {
width: 100%; width: 370rpx;
height: 199rpx; height: 199rpx;
} }
@ -991,16 +963,16 @@
position: absolute; position: absolute;
left: 17rpx; left: 17rpx;
top: 81rpx; top: 81rpx;
width: 120rpx; width: 166rpx;
height: 62rpx; height: 71rpx;
} }
.img2 { .img2 {
position: absolute; position: absolute;
top: 22rpx; top: 22rpx;
right: 25rpx; right: 25rpx;
width: 116rpx; width: 138rpx;
height: 104rpx; height: 132rpx;
} }
} }
} }
@ -1039,10 +1011,8 @@
color: #000000; color: #000000;
} }
.text { text {
position: absolute; position: absolute;
display: flex;
justify-content: flex-end !important;
right: 20rpx; right: 20rpx;
bottom: 14rpx; bottom: 14rpx;
font-size: 28rpx; font-size: 28rpx;

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

@ -20,7 +20,7 @@
<view class="image"> <view class="image">
<image :src="item.image" style="border-radius: 10rpx;"></image> <image :src="item.image" style="border-radius: 10rpx;"></image>
</view> </view>
<view class="detail" @tap="goDetail(item)"> <view class="detail">
<view class="name"> <view class="name">
{{item.storeName}} {{item.storeName}}
</view> </view>
@ -186,7 +186,7 @@
}; };
}, },
computed: { computed: {
...mapGetters(['isLogin', 'uid']), ...mapGetters(['isLogin']),
reChecked() { reChecked() {
return item => { return item => {
return item.checked return item.checked
@ -263,16 +263,6 @@
}; };
}, },
methods: { 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() { allCheck() {
this.isAllSelect = !this.isAllSelect this.isAllSelect = !this.isAllSelect