front/java-mall-admin
7
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
pull from: dev2
merge into: front:main
Conversation 0 Commits 174 Files Changed 776 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 30b30c1cba - Show all commits

4
src/views/store/base/distributionSetup/localDelivery.vue
View File

@ -658,7 +658,7 @@
> >
<label slot="append">元</label> <label slot="append">元</label>
</el-input> </el-input>
<label>起送</label> <!-- <label>起送</label> -->
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="" prop="derateAmout"> <el-form-item label="" prop="derateAmout">
@ -2299,7 +2299,7 @@ export default {
.areas-block { .areas-block {
position: relative; position: relative;
flex: 0 0 300px; flex: 0 0 310px;
height: 540px; height: 540px;
border: 1px solid #ededed; border: 1px solid #ededed;
margin-right: 20px; margin-right: 20px;