faiz
/
hy-shop-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
faiz 2024-06-14 10:14:36 +08:00
parent dceddc51f1
commit 5e305b81ed
9 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/filters/commFilter.js
View File

@ -175,7 +175,7 @@ export function orderPayType(type) {
'6': '微信扫码',
'7': '铸源星支付',
'9': '扫码支付',
'11': '绑卡支付',
'11': '绑卡快捷支付',
'12': '支付宝支付',
'13': '银联支付'
}

30
src/views/merchant/deposit/index.vue
View File

@ -107,6 +107,19 @@
class="selWidth"
/>
</el-form-item>
<el-form-item label="审核时间：" v-if="tableFrom.status == 1">
<el-date-picker
v-model="auditVal"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd HH:mm:ss"
type="datetimerange"
@change="onchangeAuditTime"
clearable
:picker-options="pickerOptions"
style="width: 280px;"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
<el-button size="small" @click="searchReset()">重置</el-button>
@ -277,6 +290,13 @@
label="申请时间"
min-width="150"
/>
<el-table-column
v-if="tableFrom.status == 1"
key="13"
prop="pay_time"
label="审核时间"
min-width="150"
/>
<el-table-column
v-if="type == 1"
key="14"
@ -712,6 +732,7 @@ export default {
},
autoUpdate: true,
timeVal: [],
auditVal:[],
recordId: "",
marginData: {
merchant: {},
@ -731,7 +752,9 @@ export default {
/**重置 */
searchReset(){
this.timeVal = []
this.auditVal = []
this.tableFrom.date = ""
this.tableFrom.pay_time = ""
this.$refs.searchForm.resetFields()
this.getList(1)
},
@ -742,6 +765,13 @@ export default {
this.tableFrom.page = 1;
this.getList("");
},
// 审核日期
onchangeAuditTime(e) {
this.auditVal = e;
this.tableFrom.pay_time = this.auditVal ? this.auditVal.join("-") : "";
this.tableFrom.page = 1;
this.getList("");
},
// 商户分类；
getMerCategory() {
getMerCateApi()

2
src/views/order/list/index.vue
View File

@ -109,7 +109,7 @@
<!-- <el-option label="微信" value="1" /> -->
<el-option label="支付宝" value="12" />
<el-option label="扫码支付" value="9" />
<el-option label="绑卡支付" value="11" />
<el-option label="绑卡快捷支付" value="11" />
<!-- <el-option label="铸源星" value="7" /> -->
</el-select>
</el-form-item>

2
src/views/order/refund/index.vue
View File

@ -76,7 +76,7 @@
>
<el-option label="支付宝" value="12" />
<el-option label="扫码支付" value="9" />
<el-option label="绑卡支付" value="11" />
<el-option label="绑卡快捷支付" value="11" />
</el-select>
</el-form-item>
<el-form-item>

3
src/views/order/refund/refundDetail.vue
View File

@ -33,6 +33,9 @@
<div class="description-term">退款总金额：{{ orderDatalist.refund_price }}元</div>
<div v-if="orderDatalist.delivery_id" class="description-term">退货快递单号：{{ orderDatalist.delivery_id }}</div>
<div class="description-term">创建时间：{{ orderDatalist.create_time }}</div>
<div class="description-term">退货金额：{{ orderDatalist.refund_price-orderDatalist.refund_postage }}</div>
<div class="description-term">退抵扣券：{{ orderDatalist.amount }}</div>
<div class="description-term">退运费金额：{{ orderDatalist.refund_postage }}</div>
<div class="description-term">商家备注：{{ orderDatalist.mer_mark }}</div>
<div class="description-term100">退款凭证：
<div class="product_name" style="margin-left: 70px;">

4
src/views/product/productExamine/info.vue
View File

@ -670,8 +670,8 @@
</el-form-item>
</el-form>
<div class="edit_mark">
<span>信息变更：</span>
<span style="color: red;">{{ projectData.edit_mark }}</span>
<div>信息变更：</div>
<div style="color: red;margin-left: 70px;" v-html="projectData.edit_mark"></div>
</div>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible = false">取 消</el-button>

8
src/views/product/productExamine/proDetails.vue
View File

@ -452,12 +452,12 @@
</div>
<div v-else class="value-item">无</div>
</li>
<li class="item">
<!-- <li class="item">
<div class="item-title">分销礼包：</div>
<div class="value">
{{ productData.is_gift_bag ? "是" : "否" }}
</div>
</li>
</li> -->
<li v-if="productData.star" class="item">
<div class="item-title">平台推荐星级：</div>
<div class="value">
@ -468,7 +468,7 @@
></el-rate>
</div>
</li>
<li
<!-- <li
v-if="productData.merchant && productData.integral_rate != 0"
class="item"
>
@ -492,7 +492,7 @@
<div class="value">
{{ productData.integral_price_total }}元
</div>
</li>
</li> -->
<li
v-if="productData.coupon && productData.coupon.length > 0"
class="item"

6
src/views/user/list/index.vue
View File

@ -88,7 +88,11 @@
</el-select>
</el-form-item>
<el-form-item label="访问时间：">
<el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" align="right" unlink-panels format="yyyy/MM/dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" :picker-options="pickerOptions" @change="onchangeTime" />
<el-date-picker
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd HH:mm:ss"
size="small"
type="datetimerange" v-model="timeVal" align="right" unlink-panels placement="bottom-end" placeholder="自定义时间" style="width: 250px;" :picker-options="pickerOptions" @change="onchangeTime" />
</el-form-item>
<el-form-item label="访问情况：" prop="user_time_type">

8
src/views/user/list/userDetails.vue
View File

@ -132,10 +132,10 @@
<div>用户状态：</div>
<div class="value">{{psInfo.status == 1 ? '开启' : '关闭'}}</div>
</li>
<li class="item">
<!-- <li class="item">
<div>用户等级：</div>
<div class="value">{{psInfo.member_level}}</div>
</li>
</li> -->
<li class="item">
<div>用户标签：</div>
<div class="value">
@ -281,7 +281,7 @@
<div class="section">
<div class="title">用户概况</div>
<el-row :gutter="24" class="mt20">
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="用户等级：">
<el-select
size="small"
@ -297,7 +297,7 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="用户分组：">
<el-select