xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 02:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung

Browse Source
This commit is contained in:
Admin 2022-01-14 14:47:13 +00:00 committed by Gitee
commit 3634764669
15 changed files with 398 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

319
rc-busness/assets/css/discount.less Normal file
View File

@ -0,0 +1,319 @@
@media screen and (max-width:768px){
.allmain{
.rc-top{
margin-top: 2.5rem;
}
}
.active {
font-size: 14px;
color: #E2001A;
}
.unactive {
font-size: 14px;
color: #444444;
}
.rc-usermain{
.online{
margin-top: 0;
}
.rc {
height: 64px;
display: flex;
align-items: center;
margin-left: 23px;
span {
display: block;
margin-left: 32px;
font-weight: bold;
}
span:first-child {
margin-left: 0;
}
}
}
.rc-discount {
margin-left: 20px;
display: flex;
margin-top: 16px;
width: 335px;
background: #ffffff;
position: relative;
img {
display: block;
width: 100%;
height: 100%;
}
.rc-contair {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
z-index: 8;
}
.rc-left {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
color: #e1001a;
text-align: center;
width: 30%;
font-weight: bold;
float: left;
height: 100%;
i {
font-style: normal;
font-size: 12px;
}
span {
font-size: 26px;
}
strong {
font-style: normal;
font-size: 12px;
display: block;
}
}
.rc-right {
display: flex;
flex-direction: column;
height: 100%;
i {
font-style: normal;
font-size: 14px;
color: #e1001a;
}
.rc-userfont {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: #999999;
font-size: 12px;
strong{
display: block;
margin-top: 8px;
}
}
em {
font-style: normal;
}
.ts-stand{
display: flex;
align-items: center;
justify-content: end;
padding-right: 17px;
margin-bottom: 8px;
}
.ts-standard-btn{
width: 72px;
display: flex;
height: 25px;
background: #E2001A;
border-radius: 100px;
align-items: center;
font-size: 12px;
justify-content: center;
margin-top: 8px;
}
span{
margin-top: 0;
}
margin-top: 17px;
padding-left: 36px;
}
.rc-footer {
display: flex;
align-items:flex-end
span {
width: 72px;
height: 25px;
background: #e2001a;
text-align: center;
line-height: 25px;
font-size: 12px;
color: #ffffff;
margin-bottom: 8px;
border-radius: 100px;
margin-right: 30px;
}
}
}
}
@media screen and (min-width: 769px){
.allmain{
.rc-top{
margin-top: 1.5rem;
}
.rs-dis{
display: flex;
flex-flow: wrap;
justify-content: center;
}
}
.active {
font-size: 14px;
color: #E2001A;
}
.unactive {
font-size: 14px;
color: #444444;
}
.rc-usermain{
.online{
margin-top: 0;
}
.rc {
height: 96px;
display: flex;
align-items: center;
margin-left: 23px;
justify-content: center;
span {
display: block;
margin-left: 40px;
font-size: 16px;
font-weight: bold;
}
span:first-child {
margin-left: 0;
}
}
}
.rc-discount {
margin-left: 20px;
display: flex;
margin-top: 16px;
width: 335px;
background: #ffffff;
position: relative;
img {
display: block;
width: 100%;
height: 100%;
}
.rc-contair {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
z-index: 8;
}
.rc-left {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
color: #e1001a;
text-align: center;
width: 30%;
font-weight: bold;
float: left;
height: 100%;
i {
font-style: normal;
font-size: 12px;
}
span {
font-size: 26px;
}
strong {
font-style: normal;
font-size: 12px;
display: block;
}
}
.rc-right {
display: flex;
flex-direction: column;
height: 100%;
i {
font-style: normal;
font-size: 16px;
color: #e1001a;
}
.rc-userfont {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: #999999;
font-size: 12px;
strong{
display: block;
margin-top: 8px;
}
}
em {
font-style: normal;
}
.ts-stand{
display: flex;
align-items: center;
justify-content: end;
padding-right: 17px;
margin-bottom: 8px;
}
.ts-standard-btn{
width: 72px;
display: flex;
height: 25px;
background: #E2001A;
border-radius: 100px;
align-items: center;
font-size: 12px;
justify-content: center;
margin-top: 8px;
}
span{
margin-top: 0;
}
margin-top: 17px;
padding-left: 36px;
}
.rc-footer {
display: flex;
align-items:flex-end;
span {
width: 72px;
height: 25px;
background: #e2001a;
text-align: center;
line-height: 25px;
font-size: 12px;
color: #ffffff;
margin-bottom: 8px;
border-radius: 100px;
margin-right: 30px;
}
}
}
}

BIN
rc-busness/assets/showimage/ico-bilibili.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
rc-busness/assets/showimage/ico-weibo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
rc-busness/assets/showimage/ico-zhihu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
rc-busness/assets/showimage/qrcode-aichong.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
rc-busness/assets/showimage/qrcode-chanpin.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
rc-busness/assets/showimage/qrcode-douyin.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
rc-busness/assets/showimage/qrcode-royal-elite.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 47 KiB

13
rc-busness/components/header.vue
View File

@ -37,7 +37,7 @@
</span> </span>
<div class="ts-hover-show"> <div class="ts-hover-show">
<span class="rc-text--center">微信扫一扫</span> <span class="rc-text--center">微信扫一扫</span>
<img src="#profiles/custom/royal_canin_profile/themes/royal_canin/images/royalcanincn-qrcode.jpg"> <img src="../assets/showimage/royalcanincn-qrcode.jpg">
</div> </div>
</a> </a>
@ -92,7 +92,8 @@
<div class="rc-full-width rc-max-width--xl rc-padding--sm"> <div class="rc-full-width rc-max-width--xl rc-padding--sm">
<ul class="rc-list rc-list--blank rc-list--align ts-list--four-column" role="menubar"> <ul class="rc-list rc-list--blank rc-list--align ts-list--four-column" role="menubar">
<li class="rc-list__item rc-list__item--group"> <li class="rc-list__item rc-list__item--group">
<img src="#profiles/custom/royal_canin_profile/themes/royal_canin/images/sub-nav/sub-nav-1.jpg" class="ts-head-img rc-margin-bottom--xs">
<img src="../assets/showimage/sub-nav-1.jpg" class="ts-head-img rc-margin-bottom--xs">
<a href="#cats" class="rc-list__header rc-margin--none" role="menuitem">猫</a> <a href="#cats" class="rc-list__header rc-margin--none" role="menuitem">猫</a>
<ul class="rc-list rc-list--blank rc-list--align test" role="menu"> <ul class="rc-list rc-list--blank rc-list--align test" role="menu">
<li class="rc-list__item"> <li class="rc-list__item">
@ -113,7 +114,7 @@
</ul> </ul>
</li> </li>
<li class="rc-list__item rc-list__item--group"> <li class="rc-list__item rc-list__item--group">
<img src="#profiles/custom/royal_canin_profile/themes/royal_canin/images/sub-nav/sub-nav-2.jpg" class="ts-head-img rc-margin-bottom--xs"> <img src="../assets/showimage/sub-nav-2.jpg" class="ts-head-img rc-margin-bottom--xs">
<a href="#dogs" class="rc-list__header rc-margin--none" role="menuitem">犬</a> <a href="#dogs" class="rc-list__header rc-margin--none" role="menuitem">犬</a>
<ul class="rc-list rc-list--blank rc-list--align test" role="menu"> <ul class="rc-list rc-list--blank rc-list--align test" role="menu">
<li class="rc-list__item"> <li class="rc-list__item">
@ -134,7 +135,7 @@
</ul> </ul>
</li> </li>
<li class="rc-list__item rc-list__item--group"> <li class="rc-list__item rc-list__item--group">
<img src="#profiles/custom/royal_canin_profile/themes/royal_canin/images/sub-nav/sub-nav-3.jpg" class="ts-head-img rc-margin-bottom--xs"> <img src="../assets/showimage/sub-nav-3.jpg" class="ts-head-img rc-margin-bottom--xs">
<a href="#tailored-nutrition" class="rc-list__header rc-margin--none" role="menuitem">定制营养方案</a> <a href="#tailored-nutrition" class="rc-list__header rc-margin--none" role="menuitem">定制营养方案</a>
<ul class="rc-list rc-list--blank rc-list--align test" role="menu"> <ul class="rc-list rc-list--blank rc-list--align test" role="menu">
<li class="rc-list__item"> <li class="rc-list__item">
@ -146,7 +147,7 @@
</ul> </ul>
</li> </li>
<li class="rc-list__item rc-list__item--group"> <li class="rc-list__item rc-list__item--group">
<img src="#profiles/custom/royal_canin_profile/themes/royal_canin/images/sub-nav/sub-nav-4.jpg" class="ts-head-img rc-margin-bottom--xs"> <img src="../assets/showimage/sub-nav-4.jpg" class="ts-head-img rc-margin-bottom--xs">
<a href="#about" class="rc-list__header rc-margin--none" role="menuitem">关于我们</a> <a href="#about" class="rc-list__header rc-margin--none" role="menuitem">关于我们</a>
<ul class="rc-list rc-list--blank rc-list--align test" role="menu"> <ul class="rc-list rc-list--blank rc-list--align test" role="menu">
<li class="rc-list__item"> <li class="rc-list__item">
@ -329,7 +330,7 @@
微信公众号 微信公众号
<div class="ts-hover-show"> <div class="ts-hover-show">
<span class="rc-text--center">微信长按识别</span> <span class="rc-text--center">微信长按识别</span>
<img src="#profiles/custom/royal_canin_profile/themes/royal_canin/images/royalcanincn-qrcode.jpg"> <img src="../assets/showimage/royalcanincn-qrcode.jpg">
</div> </div>
</a> </a>
</li> </li>

5
rc-busness/pages/index.vue
View File

@ -2,7 +2,6 @@
<div> <div>
<!-- Suppose in header end -->
<Myheader></Myheader> <Myheader></Myheader>
<div class="rc-top"></div> <div class="rc-top"></div>
<unlogin></unlogin> <unlogin></unlogin>
@ -1329,6 +1328,10 @@
this.gotop = false; this.gotop = false;
this.searchBar=true this.searchBar=true
} }
}
}, },
toTop() { toTop() {
let top = document.documentElement.scrollTop || document.body.scrollTop; let top = document.documentElement.scrollTop || document.body.scrollTop;

305
rc-busness/pages/personal/discount.vue
View File

@ -1,10 +1,13 @@
<template> <template>
<div> <div class="allmain">
<Myheader></Myheader> <Myheader></Myheader>
<tabs></tabs> <div class="online bold rc-md-down" id="fixed-catbar-seperator"></div>
<div class="rc-main"> <!-- <tabs></tabs> -->
<div class="rc-top"></div>
<div class="rc-usermain"> <div class="rc-usermain">
<div class="rc-header"> <div class="online bold"></div>
<div class="rc">
<span <span
v-for="(item, index) in discountlist" v-for="(item, index) in discountlist"
:key="index" :key="index"
@ -15,6 +18,8 @@
</span> </span>
<!-- <span @click="tanchu()">弹出</span> --> <!-- <span @click="tanchu()">弹出</span> -->
</div> </div>
<div class="online bold"></div>
<div class="rs-dis"> <div class="rs-dis">
<div <div
class="rc-discount" class="rc-discount"
@ -31,15 +36,16 @@
</div> </div>
<div class="rc-right"> <div class="rc-right">
<i> <i>
{{ item.couponDesc }} {{ item.couponName }}
</i> </i>
<div class="rc-main" id="rc-main"> <div class="rc-userfont">
<span>有效期{{item.validFrom}}至</span> <strong>有效期</strong>
<span>{{item.validFrom}}至</span>
<em>{{ item.validTo }}</em> <em>{{ item.validTo }}</em>
</div> </div>
<nuxt-link :to="`/`"> <nuxt-link :to="`/productdetails/productlist`">
<div class="rc-footer" v-if="userload"> <div v-if="userload" class="ts-stand">
<span @click="usertiao()">立即使用</span> <span @click="usertiao()" class="ts-standard-btn">立即使用</span>
</div> </div>
</nuxt-link> </nuxt-link>
</div> </div>
@ -50,17 +56,16 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
import {allConfig,getdraw} from "../../ajax/getData"; import {allConfig,getdraw} from "../../ajax/getData";
import tabs from "@/components/tabs.vue"; // import tabs from "@/components/tabs.vue";
export default { export default {
middleware: 'metaTitle',
// middleware: 'metaTitle', // middleware: 'metaTitle',
meta: {title: '优惠券'}, // // middleware: 'metaTitle',
// meta: {title: '优惠券'},
data() { data() {
return { return {
userload: true, userload: true,
@ -202,7 +207,7 @@ export default {
this.pastdue = true; this.pastdue = true;
this.userimage = require("../../assets/image/hasused.png"); this.userimage = require("../../assets/image/hasused.png");
this.userstates=1 this.userstates=1
this.userdraw(this.usermessage.data.mobile,1) this.userdraw(this.usermessage.data.mobile,0)
} }
if (this.activeIndex == 0) { if (this.activeIndex == 0) {
this.userload = true; this.userload = true;
@ -215,7 +220,7 @@ export default {
if (this.activeIndex == 2) { if (this.activeIndex == 2) {
this.userload = false; this.userload = false;
this.pastdue = true; this.pastdue = true;
this.userdraw(this.usermessage.data.mobile,2) this.userdraw(this.usermessage.data.mobile,0)
this.userstates=2 this.userstates=2
this.userimage = require("../../assets/image/expired.png"); this.userimage = require("../../assets/image/expired.png");
} }
@ -223,12 +228,9 @@ export default {
}, },
usertiao(){ usertiao(){
this.$router.push({ this.$router.push({ name: "productdetails-productlist",
path: "/",
query: { })
stype: 1,
},
});
}, },
@ -251,7 +253,6 @@ export default {
}, },
components: { components: {
Myheader, Myheader,
tabs
}, },
}; };
import Myheader from "~/components/header.vue"; import Myheader from "~/components/header.vue";
@ -259,260 +260,6 @@ import Myheader from "~/components/header.vue";
<style lang="less" scoped> <style lang="less" scoped>
// 手机端 // 手机端
@media screen and(min-width: 320px) and(max-width:768px) { @import url("../../assets/css/global.less");
.active { @import url("../../assets/css/discount.less");
font-size: 14px;
color: #e2001a;
}
.unactive {
font-size: 14px;
color: #444444;
}
.rc-header {
height: 64px;
display: flex;
align-items: center;
margin-left: 23px;
span {
display: block;
margin-left: 32px;
}
span:first-child {
margin-left: 0;
}
}
.rc-discount {
margin-left: 23px;
display: flex;
margin-top: 16px;
width: 335px;
background: #ffffff;
position: relative;
height: 120px;
img {
display: block;
width: 100%;
height: 100%;
}
.rc-contair {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.rc-left {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
color: #e1001a;
padding-right: 21px;
width: 30%;
float: left;
height: 100%;
i {
font-style: normal;
font-size: 12px;
}
span {
font-size: 26px;
}
strong {
font-style: normal;
font-size: 12px;
display: block;
margin-top: 8px;
}
}
.rc-right {
display: flex;
flex-direction: column;
margin-left: 36px;
justify-content: center;
height: 100%;
i {
font-style: normal;
font-size: 14px;
color: #e1001a;
}
.rc-main {
color: #999999;
font-size: 12px;
}
span {
display: block;
margin-top: 8px;
}
em {
font-style: normal;
}
}
.rc-footer {
display: flex;
justify-content: flex-end;
span {
width: 72px;
height: 25px;
background: #e2001a;
text-align: center;
line-height: 25px;
font-size: 12px;
color: #ffffff;
margin-bottom: 8px;
border-radius: 100px;
margin-right: 30px;
}
}
}
}
// // /* 最小768px最大1920 *pc端/
@media screen and (min-width: 768px) and (max-width: 1920px) {
.rc-main {
width: 100%;
.rc-usermain {
width: 92%;
margin: 0 auto;
}
}
.active {
font-size: 16px;
color: #e2001a;
cursor: pointer;
}
.unactive {
font-size: 16px;
color: #444444;
cursor: pointer;
}
.rc-header {
height: 64px;
display: flex;
align-items: center;
margin-left: 23px;
justify-content: center;
span {
display: block;
margin-left: 32px;
}
span:first-child {
margin-left: 0;
}
}
.rs-dis {
margin-top: 70px;
}
.rc-discount {
margin-left: 50px;
display: flex;
margin-top: 40px;
width: 335px;
background: #ffffff;
position: relative;
height: 120px;
float: left;
img {
display: block;
width: 100%;
height: 100%;
}
.rc-contair {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.rc-left {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
color: #e1001a;
padding-right: 21px;
width: 30%;
float: left;
height: 100%;
i {
font-style: normal;
font-size: 12px;
}
span {
font-size: 26px;
}
strong {
font-style: normal;
font-size: 12px;
display: block;
margin-top: 8px;
}
}
.rc-right {
display: flex;
flex-direction: column;
margin-left: 36px;
justify-content: center;
height: 100%;
i {
font-style: normal;
font-size: 16px;
color: #e1001a;
}
.rc-main {
color: #999999;
font-size: 12px;
}
span {
display: block;
margin-top: 8px;
}
em {
font-style: normal;
}
}
.rc-footer {
display: flex;
justify-content: flex-end;
margin-right: 10px;
span {
width: 72px;
height: 25px;
background: #e2001a;
text-align: center;
line-height: 25px;
font-size: 12px;
color: #ffffff;
margin-bottom: 8px;
border-radius: 100px;
margin-right: 30px;
}
}
.rc-userright {
display: flex;
align-items: center;
width: 78px;
justify-content: center;
height: 78px;
border: 2px solid #999999;
border-radius: 50%;
span {
width: 60px;
height: 60px;
border: 1px solid #999999;
border-radius: 50%;
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
}
}
}
</style> </style>

9
rc-busness/pages/productdetails/producted.vue
View File

@ -145,7 +145,7 @@
</ul> </ul>
<div class="tuntop" @click="toTop" v-show="gotop"> <div class="tuntop" @click="toTop" v-show="gotop">
<img src="../../assets/image/turntop.png" alt=""> <img src="../../assets/image/turntop.png" alt="">
回到顶部 <span>回到顶部</span>
</div> </div>
</div> </div>
<Myfooter v-on:litentop='showmesg'></Myfooter> <Myfooter v-on:litentop='showmesg'></Myfooter>
@ -227,9 +227,9 @@ import { mapMutations } from "vuex";
import { goodsmessage,getConfig,postCourseId,getdraw,alldiscount } from "../../ajax/getData"; import { goodsmessage,getConfig,postCourseId,getdraw,alldiscount } from "../../ajax/getData";
const settings = require("@/config"); const settings = require("@/config");
export default { export default {
middleware: 'metaTitle',
// middleware: 'metaTitle', // middleware: 'metaTitle',
meta: {title: '产品详情'}, // // middleware: 'metaTitle',
// meta: {title: '产品详情'},
data() { data() {
return { return {
tableLabelTest:[], tableLabelTest:[],
@ -352,6 +352,7 @@ export default {
return; return;
} }
let scrolltop = document.documentElement.scrollTop || document.body.scrollTop; let scrolltop = document.documentElement.scrollTop || document.body.scrollTop;
if(fixedCatbarSeperator!=='null' ){
if((scrolltop-fixedCatbarSeperator.offsetTop)) if((scrolltop-fixedCatbarSeperator.offsetTop))
{ {
this.gotop = true this.gotop = true
@ -360,6 +361,8 @@ export default {
{ {
this.gotop = false; this.gotop = false;
} }
}
}, },
lianxi(item,index){ lianxi(item,index){
console.log(item,index); console.log(item,index);

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/SMS/SMSController.java
View File

@ -41,7 +41,7 @@ public class SMSController {
String hash = MD5Utils.getMD5Code(KEY + "@" + currentTime + "@" + randomNum);//生成MD5值 String hash = MD5Utils.getMD5Code(KEY + "@" + currentTime + "@" + randomNum);//生成MD5值
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
resultMap.put("hash", hash); resultMap.put("hash", hash);
resultMap.put("msgNum",randomNum); // resultMap.put("msgNum",randomNum);
resultMap.put("tamp", currentTime); resultMap.put("tamp", currentTime);
return resultMap; //将hash值和tamp时间返回给前端 return resultMap; //将hash值和tamp时间返回给前端
} }

11
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
View File

@ -216,14 +216,21 @@ public class OrderService {
royalcaninOperateLogEntity.setAcceptTime(dateformat.format(acceptTime)); royalcaninOperateLogEntity.setAcceptTime(dateformat.format(acceptTime));
royalcaninOperateLogService.add(royalcaninOperateLogEntity); royalcaninOperateLogService.add(royalcaninOperateLogEntity);
return ResponseDTO.succ(); return ResponseDTO.succ();
} }
public double couponTotal(String couponTypeId,double discount,double total,int buyCount){ public double couponTotal(String couponTypeId,double discount,double total,int buyCount){
double endTotal = 0; double endTotal = 0;
switch (couponTypeId) switch (couponTypeId)
{ {
case "5" : // case "5" :
endTotal = (total * (buyCount-1)) + (total * discount); // endTotal = (total * (buyCount-1)) + (total * discount);
// break;
case "2":
endTotal = total * buyCount - discount;
break;
case "3":
endTotal = (total * buyCount) * discount;
break; break;
case "1" : case "1" :
endTotal = total * buyCount - discount; endTotal = total * buyCount - discount;