| admin/dmmall_admin/index.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/dmmall_admin/static/css/app.51bd40d6.css | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/dmmall_admin/static/js/app.17ff12aa.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/dmmall_admin/static/js/app.17ff12aa.js.map | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/components/business/OperaInformationWindow.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/components/business/OperaOrderRefundWindow.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/components/business/OperaShopInfoWindow.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/business/platformGoods.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
admin/dmmall_admin/index.html
@@ -1 +1 @@ <!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>é¼å åæºåå°ç®¡ç</title><link href="static/css/app.51bd40d6.css" rel="preload" as="style"><link href="static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="static/js/app.17ff12aa.js" rel="preload" as="script"><link href="static/js/chunk-vendors.22d73e08.js" rel="preload" as="script"><link href="static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="static/css/app.51bd40d6.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but é¼å åæºåå°ç®¡ç doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.22d73e08.js"></script><script src="static/js/app.17ff12aa.js"></script></body></html> <!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>é¼å åæºåå°ç®¡ç</title><link href="static/css/app.420cab1e.css" rel="preload" as="style"><link href="static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="static/js/app.93385205.js" rel="preload" as="script"><link href="static/js/chunk-vendors.22d73e08.js" rel="preload" as="script"><link href="static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="static/css/app.420cab1e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but é¼å åæºåå°ç®¡ç doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.22d73e08.js"></script><script src="static/js/app.93385205.js"></script></body></html> admin/dmmall_admin/static/css/app.51bd40d6.css
ÎļþÒÑɾ³ý admin/dmmall_admin/static/js/app.17ff12aa.js
ÎļþÒÑɾ³ý admin/dmmall_admin/static/js/app.17ff12aa.js.map
ÎļþÒÑɾ³ý admin/src/components/business/OperaInformationWindow.vue
@@ -1,6 +1,5 @@ <template> <GlobalWindow width="80%" :title="title" :visible.sync="visible" v-loading="isUploading" @@ -11,7 +10,7 @@ <el-form-item label="æ é¢" prop="name"> <el-input v-model="form.name" placeholder="请è¾å ¥æ é¢" v-trim/> </el-form-item> <el-form-item label="主å¾" prop="imgurlfull"> <el-form-item label="主å¾" prop="imgurl"> <UploadAvatarImage :file="{ 'imgurlfull': form.imgurlfull, 'imgurl': form.imgurl }" @uploadSuccess="uploadAvatarSuccess" @@ -119,6 +118,26 @@ }, getWangedditor(val){ this.form.content =val }, open (title, target) { this.title = title this.visible = true this.form.imgurlfull=null this.form.imgurl=null // æ°å»º if (target == null) { this.$nextTick(() => { this.$refs.form.resetFields() this.form[this.configData['field.id']] = null }) return } // ç¼è¾ this.$nextTick(() => { for (const key in this.form) { this.form[key] = target[key] } }) } } } @@ -126,43 +145,10 @@ <style lang="scss" scoped> @import "@/assets/style/alertstyle.scss"; ::v-deep .el-form-item__content { flex: 0.6; } ::v-deep .el-select { width: 100%; .el-input__inner { width: 100%; } } $image-width: 100px; .avatar-uploader { width: $image-width; height: $image-width; } ::v-deep .el-upload { border: 1px dashed #d9d9d9; border-radius: 6px; cursor: pointer; position: relative; width: $image-width; height: $image-width; overflow: hidden; } .avatar-uploader .el-upload:hover { border-color: #409EFF; } .avatar-uploader-icon { font-size: 28px; color: #8c939d; width: $image-width; height: $image-width; line-height: $image-width; text-align: center; } .avatar { width: $image-width; height: $image-width; display: block; } </style> admin/src/components/business/OperaOrderRefundWindow.vue
@@ -53,31 +53,31 @@ <div class="header-b">é款å 容</div> <div class="info-item" > <el-form :model="form" ref="form" label-width="120px" label-suffix="ï¼" :rules="rules" > <el-form-item label="é款éé¢" prop="money" style="display: block;"> <el-form-item label="é款éé¢" prop="money" > <el-input type="number" v-model="form.money" placeholder="请è¾å ¥é款éé¢" v-trim> <template slot="append"> å </template> </el-input> <span class="tip-warn" style="margin-bottom: 30px;font-size: 14px;"> <i class="el-icon-warning"></i> æ示ï¼å½å订åæå¤å¯ééé¢ä¸º<span class="red">{{(info.price||0).toFixed(2)}}</span></span> </el-form-item> <div style="display:flex;"> <el-form-item label="éè¿" prop="refundInfo" style="display: inline;"> <el-form-item label="éè¿" prop="refundInfo" > <el-checkbox style="border: none;" v-model="form.returnUseCouponStatus" label="éè¿å®¢æ·ä¼æ å¸" border></el-checkbox> </el-form-item> <el-form-item label="" prop="refundInfo" style="display: inline;"> <el-form-item label="" prop="refundInfo" > <el-checkbox style="border: none" v-model="form.returnUseIntegralStatus" label="éè¿å®¢æ·ç§¯å" border></el-checkbox> </el-form-item> </div> <div style="display:flex;"> <el-form-item label="æ£é¤" prop="refundInfo" style="display: inline;"> <el-form-item label="æ£é¤" prop="refundInfo" > <el-checkbox style="border: none" v-model="form.returnShopSettlementStatus" label="æ£é¤ç»éåå·²ç»ç®éé¢" border></el-checkbox> </el-form-item> <el-form-item label="" prop="refundInfo" style="display: inline;"> <el-form-item label="" prop="refundInfo" > <el-checkbox style="border: none" v-model="form.returnIntegralStatus" label="æ£é¤å·²è¿å®¢æ·ç§¯å" border></el-checkbox> </el-form-item> <el-form-item label="" prop="refundInfo" style="display: inline;"> <el-form-item label="" prop="refundInfo" > <el-checkbox style="border: none" v-model="form.returnShopIntegralStatus" label="æ£é¤å·²è¿ç»éå积å" border></el-checkbox> </el-form-item> </div> <el-form-item label="å¤æ³¨" prop="remark" style="display: block;"> <el-form-item label="å¤æ³¨" prop="remark" > <el-input type="textarea" :autosize="{ minRows: 4, maxRows:4 }" style="width: 500px;" v-model="form.remark" placeholder="请è¾å ¥åæ¶è¯´æ" v-trim/> </el-form-item> </el-form> admin/src/components/business/OperaShopInfoWindow.vue
@@ -126,6 +126,7 @@ <el-option :key="2" :value="2" label="å¾ æ¶è´§" ></el-option> <el-option :key="3" :value="3" label="交æå®æ" ></el-option> <el-option :key="4" :value="4" label="å·²å ³é" ></el-option> <el-option :key="6" :value="6" label="å·²é款" ></el-option> </el-select> </el-form-item> <el-form-item label="" prop="receiveType" style="display: inline-block;margin-right: 20px;"> @@ -183,7 +184,7 @@ > <el-table-column prop="code" label="订åç¼å·" fixed align="center" min-width="120px" show-overflow-tooltip> <template slot-scope="{row}"> <span style="color: #216EEE; " @click="$refs.operaGoodsOrderDetail.open('订å详æ ', row, 'first')">{{row.code}}</span> <span style="color: #216EEE;cursor: pointer; " @click="$refs.operaGoodsOrderDetail.open('订å详æ ', row, 'first')">{{row.code}}</span> </template> </el-table-column> @@ -198,7 +199,7 @@ </el-table-column> <el-table-column prop="price" label="ååæ»ä»·(å )" align="center" min-width="100px"> <template slot-scope="{row}"> {{(row.totalPrice || 0) - (row.mailPrice||0)}} {{((row.totalPrice || 0) - (row.mailPrice||0)).toFixed(2)}} </template> </el-table-column> <el-table-column prop="mailPrice" label="è¿è´¹(å )" align="center" min-width="100px"></el-table-column> admin/src/views/business/platformGoods.vue
@@ -90,8 +90,8 @@ </el-table-column> <el-table-column prop="categoryName" label="æå±åç±»" min-width="120px"></el-table-column> <el-table-column prop="brandName" label="æå±åç" min-width="120px"></el-table-column> <el-table-column prop="showPrice" label="åºåä»·(å ï¼" min-width="100px"></el-table-column> <el-table-column prop="price" label="å线价(å ï¼" min-width="100px"></el-table-column> <el-table-column prop="price" label="åºåä»·(å ï¼" min-width="100px"></el-table-column> <el-table-column prop="showPrice" label="å线价(å ï¼" min-width="100px"></el-table-column> <el-table-column prop="skuPrice" label="éå®ä»·(å )" min-width="100px"></el-table-column> <el-table-column prop="shopPrice" label="ä¾è´§ä»·è®¾ç½®" min-width="100px" align="center"> <template slot-scope="{row}" > admin/src/views/index.vue
@@ -66,7 +66,7 @@ <el-table-column prop="sortnum" label="æå" align="center"> <template slot-scope="scope">{{scope.$index +1}}</template> </el-table-column> <el-table-column prop="name" label="ç»éåå称" align="center" > </el-table-column> <el-table-column prop="name" label="ç»éåå称" show-overflow-tooltip align="center" > </el-table-column> <el-table-column prop="num" label="订åé" align="center" > </el-table-column> <el-table-column prop="price" label="éå®é¢ï¼å ï¼" align="center" ></el-table-column> <el-table-column prop="num1" label="ä¼åæ°" align="center" ></el-table-column> @@ -87,7 +87,7 @@ <el-table-column prop="sortnum" label="æå" align="center"> <template slot-scope="scope">{{scope.$index +1}}</template> </el-table-column> <el-table-column prop="name" label="ååå称" align="center" > </el-table-column> <el-table-column prop="name" label="ååå称" show-overflow-tooltip align="center" > </el-table-column> <el-table-column prop="num" label="éé" align="center" > </el-table-column> <el-table-column prop="price" label="éå®é¢ï¼å ï¼" align="center" ></el-table-column> </el-table> server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
@@ -85,9 +85,9 @@ String before, String after) { String info = type.getInfo(); if(params!=null){ if(params!=null&&info!= null){ for (int i = 0; i < params.length; i++) { info = info.replace("${param"+(i+1)+"}",params[i]); info = info.replace("${param"+(i+1)+"}",StringUtils.defaultString(params[i],"")); } } UserAction userAction=new UserAction();
