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

gdpaoup

Browse Source
This commit is contained in:
Gdpao
2020-08-04 21:46:52 +08:00
parent 43845b4810
commit 692495f108
10 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/informations/notice/notice.vue
View File

@@ -7,7 +7,7 @@
<view class="text_view">{{item.content}}</view>
<view class="notice_list">
<text>查看详情</text>
<view> > </view>
<u-icon name="arrow-right" color="#666"></u-icon>
</view>
</view>
</view>
@@ -15,7 +15,6 @@
</template>
<style lang="scss" scoped>
.notice {
background: #ECECEC;
.notice_view{
width: 690rpx;
height: 489rpx;

3
components/logininput/identifying.vue
View File

@@ -68,7 +68,8 @@
this.$refs.uCode.start();
}, 2000);
} else {
this.$u.toast('倒计时结束后再发送');
// this.$u.toast('倒计时结束后再发送');
console.log("倒计时结束后再发送");
}
}

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

@@ -31,7 +31,7 @@
<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
<view class="cancel" v-if="order.view_type == 1" @click="cancelOrder">取消支付</view>
<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount)">立即支付</view>
<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount,order.order_id)">立即支付</view>
<view class="service" v-if="order.view_type == 8">联系官方客服</view>
<view class="submit" v-if="order.view_type == 8">提交官方审核</view>
</view>
@@ -109,10 +109,11 @@ export default {
oid: this.order.order_id,
});
},
payNow(pay_sn, order_amount) {
payNow(pay_sn, order_amount, id) {
this.$u.route('/pageC/cart/cashier', {
pay_sn: pay_sn,
price: order_amount,
order_id: id
});
},
},

23
components/shop/list/index.vue
View File

@@ -4,7 +4,7 @@
<view>
<u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60" ></u-tabs-swiper>
</view>
<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
<view class="goods-item">
<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
@@ -128,11 +128,20 @@ export default {
text-align: center;
color: #333;
}
.goods-item {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
margin-top: 20rpx;
}
.swiper-box {
height: 100%;
margin-bottom: 10rpx;
.swiper-item {
height: 100%;
.goods-item {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
width: 100%;
height: 100%;
overflow-y: scroll;
}
}
}
}
</style>

1
components/shop/list/item.vue
View File

@@ -44,6 +44,7 @@ export default {
<style lang="scss" scoped>
.item{
width: 330rpx;
height: 500rpx;
margin-bottom: 26rpx;
background-color: #f8f8f8;
border-radius: 10rpx 10rpx 0rpx 0rpx;

3
components/shop/youhq/index.vue
View File

@@ -78,7 +78,7 @@ export default {
num = this.couponList.length
? this.couponList.length > 4 ? 4 : this.couponList.length
: 1
this.swiperHeight = (97 + 10) * num + 'px';
this.swiperHeight = (200 + 20) * num + 'rpx';
},
toCouponPage() {
this.$u.route({
@@ -116,6 +116,7 @@ export default {
box-sizing: border-box;
background-color: #ffffff;
.coupon-item {
height: 200rpx;
margin-bottom: 20rpx;
}
}