Skip to content

C
chinafrica
提交 41dc9516 authored 作者: 吴德鹏's avatar 吴德鹏
浏览文件
操作

提交

上级 43904607
隐藏空白字符变更
内嵌 并排
正在显示 包含 153 行增加 和 121 行删除
platform-admin/src/main/resources/dev/platform.properties
浏览文件 @ 41dc9516
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
#jdbc.username=root #jdbc.username=root
#jdbc.password=root #jdbc.password=root
jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8 #jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
jdbc.username=root #jdbc.username=root
jdbc.password=diaoyun666 #jdbc.password=diaoyun666
#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
#jdbc.username: root jdbc.username: root
#jdbc.password: Diaoyunnuli.8 jdbc.password: Diaoyunnuli.8
jdbc.initialSize=5 jdbc.initialSize=5
jdbc.maxActive=30 jdbc.maxActive=30
......
platform-admin/src/main/resources/prod/platform.properties
浏览文件 @ 41dc9516
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
#jdbc.username=root #jdbc.username=root
#jdbc.password=root #jdbc.password=root
jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8 #jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
jdbc.username=root #jdbc.username=root
jdbc.password=diaoyun666 #jdbc.password=diaoyun666
#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
#jdbc.username: root jdbc.username: root
#jdbc.password: Diaoyunnuli.8 jdbc.password: Diaoyunnuli.8
jdbc.initialSize=5 jdbc.initialSize=5
jdbc.maxActive=30 jdbc.maxActive=30
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html
浏览文件 @ 41dc9516
...@@ -85,7 +85,8 @@ ...@@ -85,7 +85,8 @@
justify-content: start; justify-content: start;
margin-bottom: 10px; margin-bottom: 10px;
} }
.container .prev-li img{
.container .prev-li img {
cursor: pointer; cursor: pointer;
object-fit: cover; object-fit: cover;
border-radius: 4px; border-radius: 4px;
...@@ -110,7 +111,8 @@ ...@@ -110,7 +111,8 @@
transform: translateY(20px); transform: translateY(20px);
line-height: 50%; line-height: 50%;
} }
.container .paramster-del{
.container .paramster-del {
transform: translateY(0px); transform: translateY(0px);
} }
...@@ -163,9 +165,11 @@ ...@@ -163,9 +165,11 @@
text-align: center; text-align: center;
margin: 10px; margin: 10px;
} }
.text-center{
.text-center {
text-align: center; text-align: center;
} }
.pp-flex-sb { .pp-flex-sb {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -288,126 +292,136 @@ ...@@ -288,126 +292,136 @@
color: black; color: black;
} }
.attribute-img-container{ .attribute-img-container {
position: fixed; position: fixed;
width:100%; width: 100%;
height: 100%; height: 100%;
left:0; left: 0;
top:0; top: 0;
z-index: 1000; z-index: 1000;
cursor: unset; cursor: unset;
} }
.attribute-img-container > .attribute-img-mask{
.attribute-img-container > .attribute-img-mask {
position: absolute; position: absolute;
top:0; top: 0;
left:0; left: 0;
width:100%; width: 100%;
height:100%; height: 100%;
background: rgba(0,0,0,0.5); background: rgba(0, 0, 0, 0.5);
} }
.attribute-img-wrapper{
.attribute-img-wrapper {
position: absolute; position: absolute;
top:50%; top: 50%;
left:50%; left: 50%;
transform: translate(-50%,-50%); transform: translate(-50%, -50%);
width:1000px; width: 1000px;
height:700px; height: 700px;
background: white; background: white;
border-radius: 4px; border-radius: 4px;
padding:20px; padding: 20px;
} }
.attribute-img-wrapper-close{
.attribute-img-wrapper-close {
position: absolute; position: absolute;
right:20px; right: 20px;
top:10px; top: 10px;
line-height: 22px; line-height: 22px;
color:black; color: black;
font-size: 22px; font-size: 22px;
cursor: pointer; cursor: pointer;
} }
.attribute-img-upload{
.attribute-img-upload {
position: absolute; position: absolute;
bottom:0px; bottom: 0px;
left:0px; left: 0px;
width:100%; width: 100%;
height:80px; height: 80px;
} }
.attribute-img-lists{
padding:10px; .attribute-img-lists {
padding: 10px;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
} }
.attribute-img{
width:150px; .attribute-img {
height:150px; width: 150px;
height: 150px;
position: relative; position: relative;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
} }
.attribute-img>.attribute-img-remove-icon{
width:40px; .attribute-img > .attribute-img-remove-icon {
height:20px; width: 40px;
height: 20px;
position: absolute; position: absolute;
right:20px; right: 20px;
top:0; top: 0;
cursor: pointer; cursor: pointer;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
z-index: 10; z-index: 10;
} }
.attribute-img>img{
.attribute-img > img {
z-index: 9; z-index: 9;
width:80%; width: 80%;
height:80%; height: 80%;
object-fit: cover; object-fit: cover;
} }
.default-img{
width:42px; .default-img {
height:42px; width: 42px;
height: 42px;
background: url('http://ku.90sjimg.com/element_origin_min_pic/01/47/26/835743e2ba5da85.jpg') no-repeat; background: url('http://ku.90sjimg.com/element_origin_min_pic/01/47/26/835743e2ba5da85.jpg') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
cursor: pointer; cursor: pointer;
} }
.attribute-sku-tag{
padding:4px 8px; .attribute-sku-tag {
padding: 4px 8px;
border-radius: 4px; border-radius: 4px;
border:1px solid #eee; border: 1px solid #eee;
display: inline-block; display: inline-block;
margin:5px; margin: 5px;
cursor: pointer; cursor: pointer;
box-shadow: 2px 2px 2px #eee; box-shadow: 2px 2px 2px #eee;
} }
.attribute-sku-tag-active{
.attribute-sku-tag-active {
box-shadow: 2px 2px 2px #1ab394; box-shadow: 2px 2px 2px #1ab394;
border-color: #1ab394; border-color: #1ab394;
} }
.attr-img{
width:58px; .attr-img {
height:58px; width: 58px;
margin-right:10px; height: 58px;
margin-right: 10px;
object-fit: cover; object-fit: cover;
} }
.confirm-btn{
.confirm-btn {
position: absolute; position: absolute;
bottom:20px; bottom: 20px;
left:50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
} }
.fixed-submit{
.flot-button {
top: 30px;
position: fixed; position: fixed;
top:30px; float: right;
right: 30px; right: 30px;
z-index: 100; z-index: 100;
float: right;
}
.preview{
right:120px;
} }
</style> </style>
</head> </head>
<body> <body>
...@@ -522,12 +536,14 @@ ...@@ -522,12 +536,14 @@
<table id="jqGrid"></table> <table id="jqGrid"></table>
</div> </div>
<Card v-show="!showList"> <Card v-show="!showList">
<i-button v-show="tbCfStationItem.itemId" @click="preview(tbCfStationItem.itemId)" style="margin-left: 20px" type="primary">预览</i-button> <div class="flot-button">
&nbsp;&nbsp; <i-button class="fixed-submit preview" v-show="tbCfStationItem.itemId"
<i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button> @click="preview(tbCfStationItem.itemId)" type="primary">预览
&nbsp;&nbsp; </i-button>
<i-button type="primary" @click="back()" /> <i-button class="fixed-submit" type="primary" @click="handleSubmit('formValidate')">提交</i-button>
返回</i-button> <i-button class="fixed-back" type="primary" @click="back()"/>
返回</i-button>
</div>
<p slot="title">{{title}}</p> <p slot="title">{{title}}</p>
<i-form ref="formValidate" :model="tbCfStationItem" :rules="ruleValidate" :label-width="80"> <i-form ref="formValidate" :model="tbCfStationItem" :rules="ruleValidate" :label-width="80">
<Form-item label="商品编号" prop="itemCode" style="width: 800px"> <Form-item label="商品编号" prop="itemCode" style="width: 800px">
...@@ -561,7 +577,7 @@ ...@@ -561,7 +577,7 @@
</div> </div>
<div class="pp-popup-wrapper" v-if="tagshow"> <div class="pp-popup-wrapper" v-if="tagshow">
<div class="pp-popup-mask"></div> <div class="pp-popup-mask"></div>
<div class="pp-popup-container"> <div class="pp-popup-container">
<h3 class="pp-text-center">数据选择</h3> <h3 class="pp-text-center">数据选择</h3>
<div class="pp-tags-section" v-for="(element,index) in tagLists" :key="index"> <div class="pp-tags-section" v-for="(element,index) in tagLists" :key="index">
<i-button <i-button
...@@ -698,13 +714,14 @@ ...@@ -698,13 +714,14 @@
<!-- <select class="f-select" v-model="el.selected"> <!-- <select class="f-select" v-model="el.selected">
<option v-for="(option,index) in el.option">{{option}}</option> <option v-for="(option,index) in el.option">{{option}}</option>
</select>--> </select>-->
<textarea <textarea
:disabled='disabledChangeAttribute' :disabled='disabledChangeAttribute'
@input="handleChangeContent" v-model="el.categoryDesc" cols="48" rows="2" @input="handleChangeContent" v-model="el.categoryDesc" cols="48" rows="2"
placeholder="请用逗号隔开各个选项" placeholder="请用逗号隔开各个选项"
></textarea> ></textarea>
<!-- <i-button type="error" @click="delAttr(i)">删除</i-button> --> <!-- <i-button type="error" @click="delAttr(i)">删除</i-button> -->
<i-button :disabled="disabledChangeAttribute" type="error" @click="confirmDel(i)">删除</i-button> <i-button :disabled="disabledChangeAttribute" type="error" @click="confirmDel(i)">删除
</i-button>
</li> </li>
</transition-group> </transition-group>
...@@ -738,24 +755,27 @@ ...@@ -738,24 +755,27 @@
<div class="attribute-img-lists"> <div class="attribute-img-lists">
<div class="attribute-img" v-for="(element,index) in AttributeImgArr"> <div class="attribute-img" v-for="(element,index) in AttributeImgArr">
<div class="attribute-img-remove-icon"> <div class="attribute-img-remove-icon">
<!-- <Icon size="20" type="ios-eye-outline" ></Icon>--> <!-- <Icon size="20" type="ios-eye-outline" ></Icon>-->
<i></i> <i></i>
<Icon size="20" type="ios-trash-outline" @click="removeAttributeImg(element.img_path,index)"></Icon> <Icon size="20" type="ios-trash-outline"
@click="removeAttributeImg(element.img_path,index)"></Icon>
</div> </div>
<img :src="element.img_path" @click="selectImg(element.img_path)"> <img :src="element.img_path" @click="selectImg(element.img_path)">
</div> </div>
<div class="attribute-img" @click="cancelSelectImg" > <div class="attribute-img" @click="cancelSelectImg">
<img title="取消选择" src="http://ku.90sjimg.com/element_origin_min_pic/01/47/26/835743e2ba5da85.jpg" width="100%" height="100%" /> <img title="取消选择"
src="http://ku.90sjimg.com/element_origin_min_pic/01/47/26/835743e2ba5da85.jpg"
width="100%" height="100%"/>
</div> </div>
</div> </div>
<div class="attribute-img-upload"> <div class="attribute-img-upload">
<Upload <Upload
multiple multiple
type="drag" type="drag"
:before-upload="handleBeforeUpload" :before-upload="handleBeforeUpload"
accept="image/jpeg, image/png" accept="image/jpeg, image/png"
action="../api/osstest/uploadtest" action="../api/osstest/uploadtest"
:on-success="handleAttributeImgSuccess" :on-success="handleAttributeImgSuccess"
> >
<div style="padding: 20px 0"> <div style="padding: 20px 0">
<Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon> <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
...@@ -771,17 +791,18 @@ ...@@ -771,17 +791,18 @@
<div class="attribute-img-container" v-show="showBatch"> <div class="attribute-img-container" v-show="showBatch">
<div class="attribute-img-mask"></div> <div class="attribute-img-mask"></div>
<div class="attribute-img-wrapper"> <div class="attribute-img-wrapper">
<h2 class="text-center" >批量操作</h2> <h2 class="text-center">批量操作</h2>
<i class="attribute-img-wrapper-close" @click.stop="showBatch=false">x</i> <i class="attribute-img-wrapper-close" @click.stop="showBatch=false">x</i>
<div> <div>
<i-button <i-button
shape="circle" shape="circle"
v-for="(item,index) in selectBtnArr" v-for="(item,index) in selectBtnArr"
:type="item.isSelected?'primary':null" :type="item.isSelected?'primary':null"
@click="changeSelectBtnArr(item,index)" @click="changeSelectBtnArr(item,index)"
style="margin-right:10px;" style="margin-right:10px;"
>{{item.title}}</i-button> >{{item.title}}
</i-button>
</div> </div>
<div> <div>
<h3 style="margin:20px 0;">属性规格</h3> <h3 style="margin:20px 0;">属性规格</h3>
...@@ -790,7 +811,8 @@ ...@@ -790,7 +811,8 @@
v-for="(item,index) in allAttributes" v-for="(item,index) in allAttributes"
@click="selectAttr(item,index)" @click="selectAttr(item,index)"
:class="item.isSelected?'attribute-sku-tag-active':null" :class="item.isSelected?'attribute-sku-tag-active':null"
>{{item.text}}</div> >{{item.text}}
</div>
</div> </div>
<div> <div>
<h3 style="margin:20px 0;">属性图片</h3> <h3 style="margin:20px 0;">属性图片</h3>
...@@ -822,11 +844,13 @@ ...@@ -822,11 +844,13 @@
</div> </div>
<div> <div>
<h3 style="margin:20px 0;">属性价格</h3> <h3 style="margin:20px 0;">属性价格</h3>
<i-input type="number" ref="amount" @on-change="changeBatch($event,'amount')" placeholder="属性价格"/> <i-input type="number" ref="amount" @on-change="changeBatch($event,'amount')"
placeholder="属性价格"/>
</div> </div>
<div> <div>
<h3 style="margin:20px 0;">属性库存</h3> <h3 style="margin:20px 0;">属性库存</h3>
<i-input type="number" ref="count" @on-change="changeBatch($event,'count')" placeholder="属性库存"/> <i-input type="number" ref="count" @on-change="changeBatch($event,'count')"
placeholder="属性库存"/>
</div> </div>
<div class="confirm-btn"> <div class="confirm-btn">
<i-button type="primary" @click="saveBatchData()">保存</i-button> <i-button type="primary" @click="saveBatchData()">保存</i-button>
...@@ -834,7 +858,8 @@ ...@@ -834,7 +858,8 @@
</div> </div>
</div> </div>
<br/> <br/>
<i-button style="margin-left:10px;margin-bottom:10px;margin-top:10px;" @click="disabledChangeAttribute=true" v-show="!disabledChangeAttribute"> <i-button style="margin-left:10px;margin-bottom:10px;margin-top:10px;"
@click="disabledChangeAttribute=true" v-show="!disabledChangeAttribute">
确定商品规格 确定商品规格
</i-button> </i-button>
<!-- 预览 --> <!-- 预览 -->
...@@ -842,33 +867,39 @@ ...@@ -842,33 +867,39 @@
<section class="form-prev"> <section class="form-prev">
<h4>预览</h4> <h4>预览</h4>
<transition-group tag="ul" name="slide"> <transition-group tag="ul" name="slide">
<li class="prev-li" v-for="(el,i) in prevItem" :key="i" > <li class="prev-li" v-for="(el,i) in prevItem" :key="i">
<div class="prev-attr"> <div class="prev-attr">
<img @click="HandleSelectAttributeImg(el,i)" width="42" height="42" :src="el.skuImg" v-if="el.skuImg" /> <img @click="HandleSelectAttributeImg(el,i)" width="42" height="42" :src="el.skuImg"
<div @click="HandleSelectAttributeImg(el,i)" class="default-img" v-else ></div> v-if="el.skuImg"/>
<div @click="HandleSelectAttributeImg(el,i)" class="default-img" v-else></div>
</div> </div>
<div class="prev-attr"> <div class="prev-attr">
<span>{{el.skuName}}</span> <span>{{el.skuName}}</span>
<!-- <div class="attribute-sku-tag" style="height:24px;width:auto;white-space:nowrap; box-shadow: none">{{el.skuDesc}}</div>--> <!-- <div class="attribute-sku-tag" style="height:24px;width:auto;white-space:nowrap; box-shadow: none">{{el.skuDesc}}</div>-->
<Tag color="geekblue" style="white-space:nowrap;">{{el.skuDesc}}</Tag> <Tag color="geekblue" style="white-space:nowrap;">{{el.skuDesc}}</Tag>
</div> </div>
<div class="prev-price"> <div class="prev-price">
<span>价格</span> <span>价格</span>
<i-input :disabled="!disabledChangeAttribute" v-model='el.skuPrice' size="small" placeholder="USD"/> <i-input :disabled="!disabledChangeAttribute" v-model='el.skuPrice' size="small"
placeholder="USD"/>
</div> </div>
<div class="prev-count"> <div class="prev-count">
<span>数量</span> <span>数量</span>
<i-input :disabled="!disabledChangeAttribute" v-model='el.skuCount' size="small" type="number" placeholder="0"/> <i-input :disabled="!disabledChangeAttribute" v-model='el.skuCount' size="small"
type="number" placeholder="0"/>
</div> </div>
<div class="prev-code"> <div class="prev-code">
<span>商品编码</span> <span>商品编码</span>
<i-input :disabled="!disabledChangeAttribute" v-model='el.skuCode' size="small" placeholder="0"/> <i-input :disabled="!disabledChangeAttribute" v-model='el.skuCode' size="small"
placeholder="0"/>
</div> </div>
<i-button :disabled="!disabledChangeAttribute" class="prev-del" type="warning" @click="del(i)">删除</i-button> <i-button :disabled="!disabledChangeAttribute" class="prev-del" type="warning"
@click="del(i)">删除
</i-button>
</li> </li>
</transition-group> </transition-group>
</section> </section>
<!-- <i-button style="margin-left:10px;" type="primary" @click='save'>保存</i-button>--> <!-- <i-button style="margin-left:10px;" type="primary" @click='save'>保存</i-button>-->
</section> </section>
</Card> </Card>
<Card class="container" style="margin-top:20px;"> <Card class="container" style="margin-top:20px;">
...@@ -882,7 +913,8 @@ ...@@ -882,7 +913,8 @@
<div> <div>
<i-input v-model="item.paramValue" size="small" type="text" placeholder="参数值"/> <i-input v-model="item.paramValue" size="small" type="text" placeholder="参数值"/>
</div> </div>
<i-button class="prev-del paramster-del" type="warning" @click="delParamster(index)" >删除</i-button> <i-button class="prev-del paramster-del" type="warning" @click="delParamster(index)">删除
</i-button>
</li> </li>
</transition-group> </transition-group>
<i-button <i-button
......
platform-admin/src/main/webapp/js/sys/tbcforderList.js
浏览文件 @ 41dc9516
...@@ -811,7 +811,7 @@ let vm = new Vue({ ...@@ -811,7 +811,7 @@ let vm = new Vue({
} }
}) })
vm.costData[0].constnum = r.orderBasicVo.realityPay; vm.costData[0].constnum = r.orderBasicVo.itemPrice;
vm.costData[1].constnum = r.orderBasicVo.expressCost; vm.costData[1].constnum = r.orderBasicVo.expressCost;
vm.costData[2].constnum = r.orderBasicVo.tax; vm.costData[2].constnum = r.orderBasicVo.tax;
vm.costData[3].constnum = r.orderBasicVo.fee; vm.costData[3].constnum = r.orderBasicVo.fee;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论