Skip to content

S
shop-new
提交 1a12d335 authored 作者: 王天霸's avatar 王天霸
浏览文件
操作

323424

上级 a8d36356
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 34 行增加 和 34 行删除
dist/index.html
浏览文件 @ 1a12d335
差异被折叠。
dist/static/css/chunk-f4f35088.ac4d17e1.css → dist/static/css/chunk-1ee58a2a.71061d71.css
浏览文件 @ 1a12d335
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.b2b5aa6a.js → dist/static/js/app.64991484.js
浏览文件 @ 1a12d335
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/system/asset/withdraw/index.vue
浏览文件 @ 1a12d335
......@@ -25,11 +25,7 @@
<el-select v-model="form.bank_id" placeholder="选择到账银行卡" style="width:260px;">
<el-option v-for="item in banklist" :key="item.Id"
:label="item.bank_name ? item.bank_name : item.bank_account_name"
<<<<<<< HEAD
:value="item.id"></el-option>
=======
:value="item.id ? item.id : item.Id"></el-option>
>>>>>>> dev_hxz
</el-select>
</el-form-item>
<el-form-item label="提现金额" prop="amount">
......@@ -288,13 +284,17 @@
} //methods结束
};
</script>
<style scoped lang="scss" type="text/stylus">
<style scoped >
.ruleFormshop {
width: 500px;
margin: 20px 0 0 120px;
}
/deep/.spe-code-con-item .el-input-group__append {
/deep/ .spe-code-con-item .el-input-group__append {
cursor: pointer;
}
/deep/ .el-card__body{
height :calc(100% - 50px);
overflow-y: scroll;
}
</style>
src/views/system/retreat/retreat/index.vue
浏览文件 @ 1a12d335
......@@ -70,13 +70,13 @@
<el-table-column label="退换货原因" align="center" prop="reason">
<template slot-scope="scope">
<span v-if="scope.row.reason==1">协商一致退款</span>
<span v-if="scope.row.reason==2">质量问题</span>
<span v-if="scope.row.reason==3">物流问题</span>
<span v-if="scope.row.reason==4">假冒品牌</span>
<span v-if="scope.row.reason==5">少件/漏发/破损/污渍</span>
<span v-if="scope.row.reason==6">7天无理由</span>
<span v-if="scope.row.reason==7">拍错/多拍/不想要</span>
<span v-if="scope.row.reason==8">其他</span>
<span v-if="scope.row.reason==2">质量问题</span>
<span v-if="scope.row.reason==3">物流问题</span>
<span v-if="scope.row.reason==4">假冒品牌</span>
<span v-if="scope.row.reason==5">少件/漏发/破损/污渍</span>
<span v-if="scope.row.reason==6">7天无理由</span>
<span v-if="scope.row.reason==7">拍错/多拍/不想要</span>
<span v-if="scope.row.reason==8">其他</span>
</template>
......@@ -93,14 +93,14 @@
<template slot-scope="scope">
<span v-if="scope.row.reason==-1">关闭</span>
<span v-if="scope.row.reason==1">用户取消</span>
<span v-if="scope.row.reason==2">待审核</span>
<span v-if="scope.row.reason==3">驳回</span>
<span v-if="scope.row.reason==4">待退货</span>
<span v-if="scope.row.reason==5">待收货</span>
<span v-if="scope.row.reason==6">重新发货</span>
<span v-if="scope.row.reason==7">重新收货</span>
<span v-if="scope.row.reason==8">待打款</span>
<span v-if="scope.row.reason==9">已完成</span>
<span v-if="scope.row.reason==2">待审核</span>
<span v-if="scope.row.reason==3">驳回</span>
<span v-if="scope.row.reason==4">待退货</span>
<span v-if="scope.row.reason==5">待收货</span>
<span v-if="scope.row.reason==6">重新发货</span>
<span v-if="scope.row.reason==7">重新收货</span>
<span v-if="scope.row.reason==8">待打款</span>
<span v-if="scope.row.reason==9">已完成</span>
</template>
</el-table-column>
<!-- <el-table-column label="到期时间" align="center" prop="TaskEndtime"/> -->
......@@ -142,31 +142,31 @@
<div class="cell">商品图</div>
</td>
<td>
<div class="cell"><img :src="form.order.Img" alt="" width="120" height="98"></div>
<!-- <div class="cell"><img :src="form.order.Img" alt="" width="120" height="98"></div> -->
</td>
<td>
<div class="cell">商品ID</div>
</td>
<td>
<div class="cell">{{form.order.GoodsId}}</div>
<div class="cell">{{form.order.goods_id}}</div>
</td>
<td>
<div class="cell">商品名</div>
</td>
<td>
<div class="cell">{{form.order.GoodsName}}</div>
<!-- <div class="cell">{{form.order.GoodsName}}</div> -->
</td>
<td>
<div class="cell">商品规格</div>
</td>
<td>
<div class="cell">{{form.order.SpecDes}}</div>
<div class="cell">{{form.order.sku_id}}</div>
</td>
<td>
<div class="cell">商品数量</div>
</td>
<td>
<div class="cell">{{form.order.Quantity}}</div>
<!-- <div class="cell">{{form.order.Quantity}}</div> -->
</td>
</tr>
<tr>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论