faiz
/
settledIn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优惠活动,ID号

This commit is contained in:
faiz 2024-12-25 14:03:15 +08:00
parent d14e2c9eab
commit 47fdf715f3
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -5,7 +5,7 @@ ENV = 'development'
# base api # base api
# www.shop.xyz # www.shop.xyz
# VUE_APP_BASE_API = 'http://zkx.tropjoin.com' # VUE_APP_BASE_API = 'http://zkx.tropjoin.com'
VUE_APP_BASE_API = 'http://testg.tropjoin.com' VUE_APP_BASE_API = 'http://test.tropjoin.com'
# VUE_APP_BASE_API = 'https://api.tropjoin.com' # VUE_APP_BASE_API = 'https://api.tropjoin.com'
# socket 连接地址 # socket 连接地址

8
src/views/order/list/orderDetails.vue
View File

@ -223,7 +223,7 @@
{{ orderDetailList.delivery_type | sendWay }} {{ orderDetailList.delivery_type | sendWay }}
</div> </div>
</li> </li>
<li <!-- <li
v-if="orderDetailList.platform_coupon_price > 0" v-if="orderDetailList.platform_coupon_price > 0"
class="item" class="item"
> >
@ -241,7 +241,7 @@
orderDetailList.platform_coupon_price orderDetailList.platform_coupon_price
}}元 }}元
</div> </div>
</li> </li> -->
<li class="item"> <li class="item">
<div>支付运费：</div> <div>支付运费：</div>
<div class="value">{{ orderDetailList.pay_postage }}</div> <div class="value">{{ orderDetailList.pay_postage }}</div>
@ -313,6 +313,10 @@
<div>上级成长值：</div> <div>上级成长值：</div>
<div class="value">{{ orderDetailList.extension_two }}</div> <div class="value">{{ orderDetailList.extension_two }}</div>
</li> </li>
<li class="item">
<div>优惠活动：</div>
<div class="value">{{ orderDetailList.luck_prizes }}</div>
</li>
</ul> </ul>
</div> </div>
<div class="section" v-if="orderDetailList.delivery_type === '1'"> <div class="section" v-if="orderDetailList.delivery_type === '1'">

9
src/views/promoter/bonusLog/index.vue
View File

@ -61,7 +61,8 @@
<el-button size="small" type="primary" @click="exports">导出</el-button> <el-button size="small" type="primary" @click="exports">导出</el-button>
</div> </div>
<el-table v-loading="listLoading" :data="tableData.data" size="small"> <el-table v-loading="listLoading" :data="tableData.data" size="small">
<el-table-column prop="bill_id" label="ID" min-width="50" /> <el-table-column prop="bill_id" label="ID" min-width="60" />
<el-table-column prop="user.number" label="ID号" min-width="70" />
<el-table-column label="用户昵称" prop="nickname" min-width="150" /> <el-table-column label="用户昵称" prop="nickname" min-width="150" />
<el-table-column prop="user.phone" label="手机号" min-width="120" /> <el-table-column prop="user.phone" label="手机号" min-width="120" />
<el-table-column <el-table-column
@ -105,11 +106,7 @@
</div> </div>
</template> </template>
<script> <script>
import { import { integralLogTitle, bonusLogLst, bonusExport } from "@/api/marketing";
integralLogTitle,
bonusLogLst,
bonusExport,
} from "@/api/marketing";
import fileList from "@/components/exportFile/fileList"; import fileList from "@/components/exportFile/fileList";
import cardsData from "@/components/cards/index"; import cardsData from "@/components/cards/index";
import createWorkBook from "@/utils/newToExcel.js"; import createWorkBook from "@/utils/newToExcel.js";