Merge branch 'sit-Carl' into sit-Leung

This commit is contained in:
Vion
2022-01-24 22:36:48 +08:00
20 changed files with 576 additions and 366 deletions

View File

@@ -41,14 +41,14 @@
</div>
<div class="rc-right">
<i :style='usercolor'>
{{ item.couponName }}
{{ item.couponDesc }}
</i>
<div class="rc-userfont">
<strong>有效期</strong>
<span>{{item.validFrom}}</span>
<em>{{item.validTo}}</em>
</div>
<nuxt-link :to="`/productdetails/productlist`">
<nuxt-link :to="`/productdetails/productlist`" v-if="activeIndex==0">
<div class="ts-standard-btn">
立即使用
</div>

View File

@@ -44,23 +44,23 @@
</div>
<div class="rc-usermain" >
<div class="rc-image">
<img src="../../static/images/default.jpg" alt="" />
<img :src= item.picFile alt="" />
</div>
<div class="rc-right" @click="usertiaozhuan(item)">
<div class="rc-usercenter">
<em>{{ item.usereat }}</em>
<em>{{ item.productName }}</em>
<div class="rc-userright">
<span>规格:{{ item.num }}</span>
<span>规格:{{ item.specifications }}</span>
</div>
</div>
<div class="rc-userbottom">
<span>数量:{{ item.pcs }}</span>
<i>10</i>
<i>{{item.ecPrice}}</i>
</div>
<div class="rc-userbottomm">
<i>{{ item.userprice }}</i>
<span>{{ item.orderstype }}</span>
<i>{{ item.userprice }}</i>
<i>{{ item.ecPrice }}</i>
<span>{{ item.pcs }}</span>
<i>{{ item.salesAmount }}</i>
</div>
</div>
@@ -320,8 +320,14 @@ export default {
this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber;
this.useralllist[i].status = this.goldmedal[i].status;
this.useralllist[i].addressUserName = this.goldmedal[i].addressUserName;
this.useralllist[i].phoneNumber = this.goldmedal[i].phoneNumber;
this.useralllist[i].phoneNumber = this.goldmedal[i].addressPhoneNumber;
this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount;
// this.useralllist[i].picFile = this.goldmedal[i].picFile; //图片路径
// this.useralllist[i].productName=this.goldmedal[i].productName;//商品名称
// this.useralllist[i].ecPrice=this.goldmedal[i].ecPrice//第一个的单价
// this.useralllist[i].pcs=this.goldmedal[i].pcs//数量
this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length
}
console.log(this.obligation)