Commit 462c60fc authored by 黄媛媛's avatar 黄媛媛

修改

parent 422fce8d
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
</div> </div>
<div class="goods-item" style="width: 10%;"> <div class="goods-item" style="width: 10%;">
<div v-for="(list,index2) in item.DetailList" :key="index2" class="goods" flex="main:center cross:center"> <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods" flex="main:center cross:center" v-if="list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 ">
<div v-if="list.OrderIntroduction.CommissionState==1">待结算</div> <div v-if="list.OrderIntroduction.CommissionState==1">待结算</div>
<div v-if="list.OrderIntroduction.CommissionState==2">已结算</div> <div v-if="list.OrderIntroduction.CommissionState==2">已结算</div>
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
</div> </div>
<div class="goods-item" style="width: 20%;"> <div class="goods-item" style="width: 20%;">
<div v-for="(list,index2) in item.DetailList" :key="index2" class="goods" > <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods" v-if="list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 ">
......
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
<el-radio v-model="addMsg.IsEnableFXGrade" :label="1">开启</el-radio> <el-radio v-model="addMsg.IsEnableFXGrade" :label="1">开启</el-radio>
<el-radio v-model="addMsg.IsEnableFXGrade" :label="2">不开启</el-radio> <el-radio v-model="addMsg.IsEnableFXGrade" :label="2">不开启</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="无上级是否开启返佣">
<el-radio v-model="addMsg.IsEnableNoSuperiorFY" :label="1">开启</el-radio>
<el-radio v-model="addMsg.IsEnableNoSuperiorFY" :label="2">不开启</el-radio>
</el-form-item>
</div> </div>
</el-card> </el-card>
<el-card class="box-card" style="margin-top:10px"> <el-card class="box-card" style="margin-top:10px">
...@@ -247,7 +251,8 @@ ...@@ -247,7 +251,8 @@
IndexImage: '', IndexImage: '',
IndexImagePath: '', IndexImagePath: '',
IsCommissionResidue: 1, IsCommissionResidue: 1,
IsEnableFXGrade:1 //1开启 2不开启 IsEnableFXGrade:1, //1开启 2不开启
IsEnableNoSuperiorFY:1,
}, },
dialogVisible: false, dialogVisible: false,
......
...@@ -104,7 +104,9 @@ ...@@ -104,7 +104,9 @@
}, },
created() { created() {
this.getList(); this.getList();
if(this.$route.query.UserId){
console.log(this.$route.query.UserId)
}
}, },
mounted() { mounted() {
}, },
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="name" label="优惠券数量"> <el-table-column prop="name" label="优惠券数量">
<template slot-scope="scope"> <template slot-scope="scope">
<span @click="CommonJump('usersCoupon')" class="blue point">{{scope.row.CouponsNum}}</span> <span @click="CommonJump('usersCoupon',{UserId:scope.row.Id})" class="blue point">{{scope.row.CouponsNum}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="卡券数量"> <el-table-column prop="name" label="卡券数量">
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</div> </div>
</div> </div>
</div> </div>
<div style="margin-bottom: 24px;"> <div style="margin-bottom: 5px;">
<span style="margin-right: 10px;"> <span style="margin-right: 10px;">
规格: 规格:
<el-tag <el-tag
...@@ -150,12 +150,11 @@ ...@@ -150,12 +150,11 @@
</el-tag> </el-tag>
</span> </span>
</div> </div>
<div class="app-order-goods-price"> <div style=" display: flex;flex-direction: row;align-items: center;">
<span>货号:{{list.ProductCode}}</span> <span>货号:{{list.ProductCode!=null && list.ProductCode!=''?list.ProductCode:'无'}}</span>
</div> <span style="margin-left:20px" v-if='list.FreeShippingRemarks!=null'>{{list.FreeShippingRemarks}}</span>
<div class="app-order-goods-price" v-if='list.FreeShippingRemarks!=null'>
<span>{{list.FreeShippingRemarks}}</span>
</div> </div>
</div> </div>
<div flex="dir:left box:mean" style="width: 300px;"> <div flex="dir:left box:mean" style="width: 300px;">
<div flex="cross:center main:center" style="display: flex;flex-direction: column;align-items: flex-start;"> <div flex="cross:center main:center" style="display: flex;flex-direction: column;align-items: flex-start;">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment