Skip to content

I
integral-mall
Commit d86e6391 by damodmg
Options

调整文案

parent ee79840a
Showing with 49 additions and 21 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>微商城</title><link href=./static/css/app.f3d17355ca9fb7aa510e69c92d01a205.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.5d95557c083ac2fe4513.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>微商城</title><link href=./static/css/app.cba1d6bb5b95e5fbcf8061f6675f3cc4.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.f564f0c0cc232c269b8f.js></script></body></html>
\ No newline at end of file
dist/static/js/app.5d95557c083ac2fe4513.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.f564f0c0cc232c269b8f.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/gift/addSku.vue
......@@ -56,7 +56,7 @@
<el-input v-model="cash" placeholder="现金" size="small" class="w-100 margin-right10 vertical-top" @blur="limitCash"></el-input>
<el-input v-model="stock" placeholder="库存" size="small" class="w-100 margin-right10 vertical-top" @blur="limitStock"></el-input>
<el-input v-model="code" placeholder="规格编码" size="small" class="w-100 margin-right10 vertical-top" @input="limitCode" @blur="limitCodeType"></el-input>
<el-input v-model="barCode" placeholder="商品条形码" size="small" class="w-100 margin-right10 vertical-top" @input="limitBarCode" @blur="limitBarCodeType"></el-input>
<el-input v-model="barCode" placeholder="礼品条形码" size="small" class="w-100 margin-right10 vertical-top" @input="limitBarCode" @blur="limitBarCodeType"></el-input>
<el-button type="primary" size="small" @click="batchSetSku">批量填充</el-button>
</div>
......@@ -69,7 +69,7 @@
<th style="width:80px"><span class="red-color">*</span>现金（元）</th>
<th style="width:120px"><span class="red-color">*</span>库存</th>
<th style="width:120px">规格编码</th>
<th style="width:120px">商品条形码</th>
<th style="width:120px">礼品条形码</th>
</tr>
</thead>
<tbody>
......
src/views/goods/gift/gift.vue
......@@ -16,7 +16,7 @@
<div class="operate-top">
<div class="fl">
<div class="search-item">
<el-input v-model="searchValue" placeholder="请输入商品名称/货号进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
<el-input v-model="searchValue" placeholder="请输入礼品名称/货号进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
</div>
<div class="search-item">
<el-select v-model="shelf" placeholder="上下架状态" clearable class="w-140" @change="getList">
......@@ -25,7 +25,7 @@
</el-select>
</div>
<div class="search-item">
<el-select v-model="giftType" placeholder="商品类型" clearable class="w-140" @change="getList">
<el-select v-model="giftType" placeholder="礼品类型" clearable class="w-140" @change="getList">
<el-option label="实物礼品" :value="1"></el-option>
<el-option label="虚拟礼品" :value="2"></el-option>
</el-select>
......
src/views/goods/gift/info.vue
......@@ -57,18 +57,18 @@
</div>
<div class="section-content">
<h3>销售信息</h3>
<el-form-item label="商品规格">
<el-form-item label="礼品规格">
<addSku :skuJson="giftProStandardJson" @getSpuStock="getSpuStock" @getStandradList="getStandradList" @getSkuList="getSkuList" @IsAgreeUpload="IsAgreeUpload" :isStdImg="isStdImg" :skuList="skuList"></addSku>
</el-form-item>
<el-form-item label="商品编码">
<el-form-item label="礼品编码">
<table class="spu-table">
<thead>
<tr>
<th>商品编码</th>
<th>礼品编码</th>
<th style="width:80px"><span class="red-color">*</span>积分</th>
<th style="width:80px"><span class="red-color">*</span>现金（元）</th>
<th style="width:120px"><span class="red-color">*</span>库存</th>
<th style="width:120px">商品条形码</th>
<th style="width:120px">礼品条形码</th>
</tr>
</thead>
<tbody>
......
src/views/order/couponExchange.vue
......@@ -46,8 +46,10 @@
<div class="gift-info">
<img :src="scope.row.giftMainPic" />
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}<i class="el-icon-edit"></i></p>
<p class="category-ellipsis">颜色：黑色 尺码：L</p>
<p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<p class="category-ellipsis">
<span v-for="(i, v) in scope.row.sku" :key="v" style="margin-right:3px">{{ i.proName }}:{{ v.valueName ? v.valueName : '--' }}</span>
</p>
<p class="category-ellipsis">规格编码:{{ scope.row.proCode }}</p>
</div>
</div>
......@@ -192,6 +194,11 @@ export default {
if (res.data.result.rows) {
this.tableData = res.data.result.rows;
this.total = res.data.result.total;
for (let item of this.tableData) {
if (item.sku) {
item.sku = JSON.parse(item.sku);
}
}
} else {
this.tableData = [];
this.total = 0;
......
src/views/order/giftExchange.vue
......@@ -50,7 +50,9 @@
<img :src="scope.row.giftMainPic" />
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<p class="category-ellipsis">颜色：黑色 尺码：L</p>
<p class="category-ellipsis">
<span v-for="(i, v) in scope.row.sku" :key="v" style="margin-right:3px">{{ i.proName }}:{{ v.valueName ? v.valueName : '--' }}</span>
</p>
<p class="category-ellipsis">规格编码:{{ scope.row.proCode }}</p>
</div>
</div>
......@@ -217,6 +219,11 @@ export default {
if (res.data.result.rows) {
this.tableData = res.data.result.rows;
this.total = res.data.result.total;
for (let item of this.tableData) {
if (item.sku) {
item.sku = JSON.parse(item.sku);
}
}
} else {
this.tableData = [];
this.total = 0;
......
src/views/order/importInfo.vue
......@@ -38,8 +38,8 @@ export default {
},
data() {
return {
action: window.location.origin + '/api-mall/upload-goods-selected-goods?requestProject=mall',
// action:'http://gicdev.demogic.com/api-mall/upload-goods-selected-goods?requestProject=mall',
// action: window.location.origin + '/api-intergral-mall/upload-order-ship?requestProject=intergral-mall',
action: 'http://gicdev.demogic.com//api-intergral-mall/upload-order-ship?requestProject=intergral-mall',
dialogForm: {},
errorList: []
};
......
src/views/order/refundList.vue
......@@ -60,7 +60,21 @@
</el-table-column>
<el-table-column prop="orderRefundNumber" label="退款编号" min-width="120px">
<template slot-scope="scope">
<p>{{ scope.row.refundNumber }}</p>
<el-dropdown placement="bottom-end">
<span class="el-dropdown-link"> {{ scope.row.refundNumber }}<i class="el-icon-arrow-down el-icon--right"></i> </span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>订单编号：</el-dropdown-item>
<el-dropdown-item>商户支付号：</el-dropdown-item>
<el-dropdown-item>支付流水号：</el-dropdown-item>
<el-dropdown-item>下单时间：</el-dropdown-item>
<el-dropdown-item>付款时间：</el-dropdown-item>
<el-dropdown-item>发货时间：</el-dropdown-item>
<el-dropdown-item>交易完成时间：</el-dropdown-item>
<el-dropdown-item>收货信息：</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<!-- <p>{{ scope.row.refundNumber }}</p> -->
</template>
</el-table-column>
<el-table-column prop="definedCode" label="退款方式">
......@@ -85,13 +99,13 @@
</el-table-column>
<el-table-column prop="complete" label="退款状态">
<template slot-scope="scope">
<p style="line-height:18px" v-if="scope.row.refundStatus === 0">待退款</p>
<p style="line-height:18px" v-if="scope.row.refundStatus === 1">退款成功</p>
<p style="line-height:18px" v-if="scope.row.refundStatus === 2">退款关闭</p>
<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>
<p style="line-height:18px;" v-if="scope.row.refundStatus === 2">退款关闭</p>
<p style="line-height:18px">
<el-button type="text" v-if="scope.row.refundStatus === 0" @click="handleArgeeRefund(scope.row)">同意</el-button>
<el-button type="text" v-if="scope.row.refundType === 1" @click="handleDeliver(scope.row)">发货</el-button>
<el-button type="text" v-if="scope.row.refundType === 2" @click="handleCloseRefund(scope.row)">关闭</el-button>
<el-button type="text" v-if="scope.row.refundType === 1 && scope.row.refundStatus === 0" @click="handleDeliver(scope.row)">发货</el-button>
<el-button type="text" v-if="scope.row.refundType === 2 && scope.row.refundStatus === 0" @click="handleCloseRefund(scope.row)">关闭</el-button>
</p>
</template>
</el-table-column>
......
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