theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

Browse Source
This commit is contained in:
luyuan 2020-08-12 11:33:34 +08:00
commit ab4e50a9ae
Signed by: theluyuan
GPG Key ID: A7972FD973317FF3
8 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/mine/order-item/index.vue
View File

@ -79,6 +79,9 @@ export default {
case 9:
state = '拼团中';
break;
case 10:
state = '已取消';
break;
default:
break;
}

3
pageB/coupon/index.vue
View File

@ -62,10 +62,11 @@
z-index: 3;
color: #EBB36E;
position: absolute;
font-size: 98rpx;
font-size: 92rpx;
font-weight: bold;
top: 200rpx;
left: 50%;
font-family: PingFang SC;
transform: translate(-68%, 0);
}
.coupon-image {

13
pageB/search/searchGoods.vue
View File

@ -16,7 +16,8 @@
<image :src="goods.goods_image"></image>
<view class="right">
<view class="name u-line-1">{{ goods.goods_name }}</view>
<view class="briefing u-line-2">{{ goods.goods_advword }}</view>
<view class="briefing u-line-1">{{ goods.goods_advword }}</view>
<view class="price">￥{{ goods.goods_price }}</view>
</view>
</view>
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
@ -199,15 +200,21 @@ export default {
}
.right {
width: 418rpx;
height: 200rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
.name {
font-size: 30rpx;
color: rgba(51,51,51,1);
margin-bottom: 20rpx;
}
.briefing {
font-size: 28rpx;
color: rgba(102,102,102,1);
line-height: 42rpx;
}
.price {
font-size: 26rpx;
color: rgba(255,49,49,1);
}
}
}

32
pageC/cart/index.vue
View File

@ -326,10 +326,13 @@ export default {
font-weight: 500;
color: rgba(255,49,49,1);
}
.u-numberbox {
/deep/ .u-numberbox {
border: 1rpx solid rgba(217,215,215,1);
border-radius:4px;
/deep/ .u-number-input {
.u-icon-minus, .u-icon-plus {
width: 38rpx;
}
.u-number-input {
margin: 0;
color: #333 !important;
border: 1rpx #D9D7D7 solid {
@ -338,31 +341,6 @@ export default {
}
}
}
// .num {
// display: flex;
// width: 118rpx;
// height: 39rpx;
// border: 1rpx solid rgba(217,215,215,1);
// border-radius:4px;
// .reduce, .increase {
// flex: 1;
// font-size: 11rpx;
// color: #FF780F;
// line-height: 39rpx;
// text-align: center;
// }
// .value {
// flex: 1;
// font-size: 22rpx;
// color:rgba(51,51,51,1);
// line-height: 39rpx;
// text-align: center;
// border: 1rpx #D9D7D7 solid {
// top: 0px;
// bottom: 0px;
// }
// }
// }
}
}
}

13
pageC/classify/goods.vue
View File

@ -16,7 +16,8 @@
<image :src="goods.goods_image"></image>
<view class="right">
<view class="name u-line-1">{{ goods.goods_name }}</view>
<view class="briefing u-line-2">{{ goods.goods_advword }}</view>
<view class="briefing u-line-1">{{ goods.goods_advword }}</view>
<view class="price">￥{{ goods.goods_price }}</view>
</view>
</view>
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
@ -176,15 +177,21 @@ export default {
}
.right {
width: 418rpx;
height: 200rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
.name {
font-size: 30rpx;
color: rgba(51,51,51,1);
margin-bottom: 20rpx;
}
.briefing {
font-size: 28rpx;
color: rgba(102,102,102,1);
line-height: 42rpx;
}
.price {
font-size: 26rpx;
color: rgba(255,49,49,1);
}
}
}

4
pageE/mine/ImageTextCollection.vue
View File

@ -3,7 +3,7 @@
<view class="container">
<view class="item-box" v-for="(item, index) in articleList" :key="index" @click="toDetailsPage(item.article_id)">
<view class="video-item" v-if="item">
<image class="head" :src="item.article_pic" mode="scaleToFill" v-if="item.type == 1"></image>
<image class="head" :src="item.article_pic" mode="aspectFill" v-if="item.type == 1"></image>
<view class="header_fist" v-else>
<view class="backes"></view>
<image class="head" :src="item.article_pic"></image>
@ -219,7 +219,7 @@ export default {
.backes{
position: absolute;
top: 0;
background: rgba(0,0,0,0.6);
// background: rgba(0,0,0,0.6);
width: 100%;
height: 100%;
color: #fff;

24
pageE/order/Details.vue
View File

@ -20,12 +20,12 @@
</view>
<view class="info-goods">
<view class="goods-store">
<view class="stoer-title">
<view class="stoer-title" @click="viewStoreDetails(orderInfo.extend_store.store_id)">
<image :src="orderInfo.extend_store.store_avatar" class="store-image"></image>
<view class="store-name">{{ orderInfo.extend_store.store_name }}</view>
<image src="../static/mine/21.png" class="right-icon"></image>
</view>
<view v-for="goods in orderInfo.extend_order_goods" :key="goods.goods_id">
<view v-for="goods in orderInfo.extend_order_goods" :key="goods.goods_id" @click="viewGoodsDetails(goods.goods_id)">
<view class="store-goods">
<image :src="goods.goods_image"></image>
<view class="goods-info">
@ -118,6 +118,10 @@ export default {
text: '拼团中',
image: '../static/mine/37.png',
},
'9': {
text: '已取消',
image: '../static/mine/33.png',
},
},
orderInfo: {},
oid: '',
@ -166,11 +170,27 @@ export default {
case 9:
state = '8';
break;
case 10:
state = '9';
break;
default:
break;
}
this.orderstate = state;
},
viewStoreDetails(id) {
this.$u.route('pageC/merchant/index', {
id: id
});
},
viewGoodsDetails(id) {
this.$u.route({
url: 'pageB/sdetails/index',
params: {
id: id,
}
})
},
setSpikeTime(time) {
// console.log(time);
this.timer = setInterval(() => {

6
pages/index/index.vue
View File

@ -270,9 +270,9 @@
this.articleList = [];
}
this.getArticlelist();
if (this.hasLogin) {
// this.isNewmembervoucher();
}
// if (this.hasLogin) {
// this.isNewmembervoucher();
// }
},
onLoad(){
this.getSwiper();