liudan
/
huitong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
liudan 11 months ago
parent 8d86bc262c
commit 4bdf1e718f
7 changed files with 52 additions and 29 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      pages.json
  2. 21
      pages/activity/collect_coupons/index.vue
  3. 23
      pages/columnGoods/goods_coupon_list/index.vue
  4. 10
      pages/index/component/goodList.vue
  5. 12
      pages/order_details/index.vue
  6. 9
      pages/store/home/index.vue
  7. 2
      pages/users/order_list/index.vue

4
pages.json
Unescape View File

@ -922,7 +922,7 @@
{
"path": "goods_coupon_list/index",
"style": {
"navigationBarTitleText": "优惠券商品"
"navigationBarTitleText": "福利专区"
}
},
{
@ -1088,7 +1088,7 @@
{
"path": "collect_coupons/index",
"style": {
"navigationBarTitleText": "领劵中心"
"navigationBarTitleText": "新人福利"
}
},
{

21
pages/activity/collect_coupons/index.vue
Unescape View File

@ -135,10 +135,23 @@
page: this.page,
limit: this.limit
}).then(res=>{
this.list = this.list.concat(res.data.list);
this.loading = false;
this.loaded = res.data.list.length != this.limit;
this.page ++;
console.log(res)
let couponGetList = res.data.list.filter(item=>{
return !item.issue.coupon_id //未领取
})
//couponGetList 未领取的数量
console.log(couponGetList)
if(couponGetList.length!=0){
this.list = this.list.concat(res.data.list);
this.loading = false;
this.loaded = res.data.list.length != this.limit;
this.page ++;
}else{
uni.redirectTo({
url:"/pages/columnGoods/goods_coupon_list/index?coupon_id="+res.data.list[0].coupon_id
})
}
})
},
//切换类型

23
pages/columnGoods/goods_coupon_list/index.vue
Unescape View File

@ -37,10 +37,10 @@
</view>
<block>
<view class="container">
<view v-if="productList.length>0" class="coupon_count acea-row">
<!-- <view v-if="productList.length>0" class="coupon_count acea-row">
<text class="text">以下商品适用于</text>
<text class="coupon_used" :style="{ 'background-image': `url(${domain}/static/diy/coupon${keyColor}.png)` }">满{{couponData.use_min_price}}减{{couponData.coupon_price}}</text>
</view>
</view> -->
<!-- 商品 -->
<view class='list acea-row row-between-wrapper on'>
<view class='item on' hover-class='none' v-for="(item,index) in productList" :key="index"
@ -468,7 +468,7 @@
left: 0;
top: 0;
z-index: 9;
background-color: var(--view-theme);
// background-color: var(--view-theme);
}
.productList .search .back {
@ -604,7 +604,7 @@
padding: 0 20rpx;
}
.productList .list.on {
background-color: #fff;
// background-color: #fff;
border-top: 1px solid #f6f6f6;
}
.item_tags{
@ -851,17 +851,20 @@ border-top: 1px solid #F6F6F6;
width: 100%;
display: flex;
border-bottom: 1rpx solid #f6f6f6;
padding: 30rpx 0;
margin: 0;
padding: 30rpx;
// margin: 0;
position: relative;
margin: 10rpx 0rpx;
background-color: #fff;
border-radius:10px;
}
.productList .list .item .pictrue.on {
width: 260rpx;
height: 260rpx;
width: 200rpx;
height: 200rpx;
}
.productList .list .item .pictrue image {
width: 260rpx;
height: 260rpx;
width: 200rpx;
height: 200rpx;
border-radius: 16rpx;
}
.productList .list .item .text {

10
pages/index/component/goodList.vue
Unescape View File

@ -150,11 +150,11 @@ export default {
limit: this.numConfig,
type: 1
};
if(this.merId){
data.mer_cate_id = this.selectId.toString()
}else{
data.cate_pid = this.selectId.toString()
}
// if(this.merId){
// data.mer_cate_id = this.selectId.toString()
// }else{
// data.cate_pid = this.selectId.toString()
// }
}
getProductslist(data).then(res => {
this.tempArr = res.data.list;

12
pages/order_details/index.vue
Unescape View File

@ -122,12 +122,14 @@
<orderGoods :orderData='item' :evaluate='item.status' :activityType='item.activity_type' :orderId="item.order_id" :cartInfo="item.orderProduct" :jump="true"></orderGoods>
</block>
</block>
<div v-if="orderInfo.merchant && orderInfo.merchant.services_type == 1" class="goodCall" @click="call">
<!-- @click="call" -->
<button open-type="contact" v-if="orderInfo.merchant && orderInfo.merchant.services_type == 1" class="goodCall" >
<text class="iconfont icon-kefu"></text><text style="font-size: 28rpx;">联系客服</text>
</div>
<div v-else class="goodCall" @click="goGoodCall">
</button>
<!-- @click="goGoodCall" -->
<button open-type="contact" v-else class="goodCall">
<text class="iconfont icon-kefu"></text><text style="font-size: 28rpx;">联系客服</text>
</div>
</button>
<!-- 送货 -->
<view class="wrapper" v-if="orderInfo.delivery_type == 2">
<view class='item acea-row row-between'>
@ -240,7 +242,7 @@
<view class="content-clip"></view>
<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false">
<!-- <view class='bnt cancel' @click="cancelSales">取消售后</view> -->
<view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view>
<!-- <view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view> -->
<view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)" class=" acea-row row-right row-middle">
<view v-if="orderInfo.presellOrder.activeStatus == 0" class='bnt b-color btn_auto'>{{ orderInfo.presellOrder.final_start_time | filterDay }} 付尾款</view>
<view v-if="orderInfo.presellOrder.activeStatus == 1" class='bnt b-color' @tap='pay_open'>立即付款</view>

9
pages/store/home/index.vue
Unescape View File

@ -101,9 +101,12 @@
<text class="iconfont icon-kefu3"></text>
</view>
<!-- #endif -->
<view v-else class="kefu" @click="goService">
<button open-type="contact" v-else class="kefu">
<text class="iconfont icon-kefu3"></text>
</view>
</button>
<!-- <view v-else class="kefu" @click="goService">
<text class="iconfont icon-kefu3"></text>
</view> -->
<!-- <button hover-class="none" :class="store.care ? 'care' : ''" v-if="!isLogin" @click="authOpen">
<text v-show="!store.care" class="iconfont icon-guanzhu"></text>
{{ store.care ? '已关注' : '关注' }}
@ -1244,6 +1247,8 @@
color: #ffffff;
margin-right: 26rpx;
cursor: pointer;
background: transparent;
width: auto;
.icon-kefu3{
font-size: 34rpx;
}

2
pages/users/order_list/index.vue
Unescape View File

@ -221,7 +221,7 @@
</view>
</view>
<view class='bottom acea-row row-right row-middle'>
<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt' @click.stop='applyInvoice(item.order_id)'>申请开票</view>
<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt' @click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
</block>

Write Preview
Loading…
Cancel
Save