Skip to content

I
integral-mall
Commit ede92715 by 陈羽
Options

update: style

parent 19c3194b
Showing with 33 additions and 48 deletions
src/views/goods/coupon/coupon.vue
......@@ -43,8 +43,8 @@
</div>
<div v-loading="loading">
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table-column type="selection" width="50" :selectable="selectInit"></el-table-column>
<el-table-column label="礼品信息" min-width="260px">
<el-table-column fixed type="selection" width="50" :selectable="selectInit"></el-table-column>
<el-table-column fixed label="礼品信息" min-width="260px">
<template slot-scope="scope">
<div class="gift-info">
<!-- <p v-if="scope.row.cardType === 2" style="display:inline-block">
......@@ -137,7 +137,7 @@
<span style="display:none">{{ refash }}</span>
</template>
</el-table-column>
<el-table-column label="操作" min-width="180px">
<el-table-column fixed="right" label="操作" min-width="180px">
<template slot-scope="scope">
<div>
<el-button type="text" @click="getLink(scope.row)" v-if="scope.row.canEdit">推广</el-button>
......@@ -313,18 +313,9 @@ export default {
// 地素 ff80808163218c030163429b47110635
// 地素测试 ff8080816f12b5c0016f1d5896820147
getUserId() {
request.get('/api-auth/get-login-user-info').then(res => {
request.get('/api-integral-mall/can-differential-pricing').then(res => {
if (res.data.errorCode === 0) {
this.enterpriseId = res.data.result.enterpriseId;
let id1 = 'ff8080815dacd3a2015dacd3ef5c0000';
let id2 = 'ff80808163218c030163429b47110635';
let id3 = 'ff8080816f12b5c0016f1d5896820147';
let id4 = 'ff8080816a36326c016a53380d8b5f52';
if (this.enterpriseId === id1 || this.enterpriseId === id2 || this.enterpriseId === id3 || this.enterpriseId === id4) {
this.specialOrder = true;
} else {
this.specialOrder = false;
}
this.specialOrder = res.data.result == 1;
} else {
this.$message.error(res.data.message);
}
......
src/views/goods/gift/gift.vue
......@@ -45,22 +45,20 @@
<el-select v-model="category" placeholder="礼品分类" class="w-140" clearable @change="getListCurr">
<el-option v-for="(v, i) in categoryOptions" :key="i" :label="v.categoryName" :value="v.integralMallCategoryId">
<span class="fl">{{ v.categoryName }}</span>
</el-option>
</el-select>
</div>
<div class="search-content-item" style="height:32px;">
<el-checkbox v-model="showSelfStatus" label="仅看本人" border @change="getListCurr" v-if="showFlag"></el-checkbox>
</el-option> </el-select
><el-checkbox style="margin-left:8px;" v-model="showSelfStatus" label="仅看本人" border @change="getListCurr" v-if="showFlag"></el-checkbox>
</div>
<div class="search-content-item" style="height:32px;"></div>
</div>
<div class="right">
<div class="search-item">
<div class="right" style="display: flex;justify-content: space-between;width:318px;padding-left:8px;box-sizing: border-box;">
<div class="search-content-item" style="width:214px;">
<el-select v-model="goodsType" placeholder="请选择批量操作" clearable @change="handleData">
<el-option label="批量上架" :value="0"></el-option>
<el-option label="批量下架" :value="1"></el-option>
<el-option label="批量删除" :value="2"></el-option>
</el-select>
</div>
<el-button type="primary" @click="addGift">新增礼品</el-button>
<el-button type="primary" @click="addGift" style="height:32px;margin-left:8px;">新增礼品</el-button>
</div>
</div>
<div v-loading="loading">
......@@ -328,18 +326,9 @@ export default {
// 地素 ff80808163218c030163429b47110635
// 地素测试 ff8080816f12b5c0016f1d5896820147
getUserId() {
request.get('/api-auth/get-login-user-info').then(res => {
request.get('/api-integral-mall/can-differential-pricing').then(res => {
if (res.data.errorCode === 0) {
this.enterpriseId = res.data.result.enterpriseId;
let id1 = 'ff8080815dacd3a2015dacd3ef5c0000';
let id2 = 'ff80808163218c030163429b47110635';
let id3 = 'ff8080816f12b5c0016f1d5896820147';
let id4 = 'ff8080816a36326c016a53380d8b5f52';
if (this.enterpriseId === id1 || this.enterpriseId === id2 || this.enterpriseId === id3 || this.enterpriseId === id4) {
this.specialOrder = true;
} else {
this.specialOrder = false;
}
this.specialOrder = res.data.result == 1;
} else {
this.$message.error(res.data.message);
}
......
src/views/order/couponExchange.vue
......@@ -54,7 +54,7 @@
<div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<!-- <el-table-column type="selection" width="40"> </el-table-column> -->
<el-table-column label="礼品信息" min-width="350px">
<el-table-column label="礼品信息" min-width="350px" fixed>
<template slot-scope="scope">
<div class="gift-info">
<!-- <img v-if="scope.row.cardType === 2" src="../../../static/img/dui.png" alt="" /> -->
......@@ -123,7 +123,7 @@
</p>
</template>
</el-table-column>
<el-table-column prop="saleNum" label="实付金额" min-width="120px">
<el-table-column fixed="right" prop="saleNum" label="实付金额" min-width="120px">
<template slot-scope="scope">
<p style="line-height:18px">积分：{{ scope.row.unitCostIntegral }}</p>
<p style="line-height:18px">现金：￥{{ scope.row.payCost }}</p>
......
src/views/order/giftExchange.vue
......@@ -54,7 +54,7 @@
</div>
</div>
<div class="top-right-btn">
<div class="right">
<el-button type="primary" @click="betachDeliver">批量发货</el-button>
<el-button plain @click="exportExcel"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button>
</div>
......@@ -69,7 +69,7 @@
<div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<!-- <el-table-column type="selection" width="40"> </el-table-column> -->
<el-table-column label="礼品信息" min-width="300px">
<el-table-column fixed label="礼品信息" min-width="300px">
<template slot-scope="scope">
<div class="gift-info">
<img :src="scope.row.giftMainPic" />
......@@ -156,7 +156,7 @@
</p>
</template>
</el-table-column>
<el-table-column prop="saleNum" label="实付金额" min-width="120px">
<el-table-column fixed="right" prop="saleNum" label="实付金额" min-width="120px">
<template slot-scope="scope">
<p style="line-height:18px">积分：{{ scope.row.unitCostIntegral }}</p>
<p style="line-height:18px">现金：￥{{ scope.row.payCost }}</p>
......@@ -598,7 +598,7 @@ export default {
this.endTime = this.getTimeAll(this.dateValue[1]);
} else {
this.beginTime = '';
this.beginTime = '';
this.endTime = '';
}
if (!this.beginTime || !this.beginTime) {
this.$message.error('时间不能为空');
......@@ -609,8 +609,6 @@ export default {
changeType: this.changeType ? this.changeType : -1,
searchParams: this.searchValue,
searchType: this.searchType,
beginTime: this.beginTime,
endTime: this.endTime,
integralMallProId: this.integralMallProId ? this.integralMallProId : '',
pageType: 2, //1、代表优惠券订单列表 2、礼品订单
creatorId: this.creatorId,
......@@ -883,16 +881,23 @@ export default {
.operate-top {
display: flex;
justify-content: space-between;
height: 74px;
height: auto;
margin: 0 24px;
padding: 24px 24px 0;
background: #fff;
.left {
height: 74px;
display: flex;
gap: 8px;
flex-wrap: wrap;
}
.right {
display: flex;
justify-content: space-between;
width: 213px;
height: 32px;
padding-left: 8px;
box-sizing: border-box;
}
}
/deep/.search-content-item.date-input > .el-input-group {
& > .el-input__inner {
......
src/views/order/refundList.vue
......@@ -52,8 +52,8 @@
<el-tab-pane label="退款关闭" name="2" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<el-table-column type="selection" width="50"> </el-table-column>
<el-table-column label="礼品信息" min-width="300px">
<el-table-column fixed type="selection" width="50"> </el-table-column>
<el-table-column fixed label="礼品信息" min-width="310px">
<template slot-scope="scope">
<div class="gift-info">
<img :src="scope.row.photoUrl" />
......@@ -118,7 +118,7 @@
<el-table-column prop="updaterName" label="操作人" width="160px">
<template slot-scope="scope">{{ scope.row.refundStatus === 0 || status === '0' ? '--' : scope.row.updaterName }}</template>
</el-table-column>
<el-table-column prop="complete" label="退款状态" width="120px">
<el-table-column fixed="right" prop="complete" label="退款状态" width="120px">
<template slot-scope="scope">
<p style="line-height:18px;margin-bottom:5px" v-if="scope.row.refundStatus === 0">待退款</p>
<p style="line-height:18px;" v-if="scope.row.refundStatus === 1">退款成功</p>
......
src/views/setting/convenSet.vue
......@@ -41,7 +41,7 @@
<el-switch v-model="form.autoConfirmReceipt" :active-value="1" :inactive-value="0" @change="form.autoConfirmReceiptDay = null"> </el-switch>
</el-form-item>
<el-form-item prop="autoConfirmReceiptDay" v-if="form.autoConfirmReceipt === 1" :rules="[{ required: true, message: '请选择自动收货天数' }]">
<el-select v-model="form.autoConfirmReceiptDay" placeholder="请选择">
<el-select v-model="form.autoConfirmReceiptDay" placeholder="请选择自动收货天数">
<el-option label="7天后" :value="7"> </el-option>
<el-option label="15天后" :value="15"> </el-option>
<el-option label="30天后" :value="30"> </el-option>
......@@ -49,7 +49,7 @@
</el-form-item>
<div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
<el-form-item class="fix-btn">
<el-button type="primary" @click="handleSubmit('form')" :loading="btnLoading">确定</el-button>
<el-button type="primary" @click="handleSubmit('form')" :loading="btnLoading">保存</el-button>
</el-form-item>
</div>
</el-form>
......
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