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

This commit is contained in:
Admin 2022-01-19 13:55:12 +00:00 committed by Gitee
commit f76d080da4
15 changed files with 2505 additions and 1909 deletions

View File

@ -72,22 +72,18 @@ export const postCourseId = (productCode,buyCount,memberId, mobile,productImg,pr
/**
* 是否存在购物车
*/
export const isexistCart = (id, pet,address) => {
export const isexistCart = (id) => {
var data = {
memberId: id,
}
return fetch('getCartProductInfo?memberId='+id,data,'POST')
return fetch('getCartProductInfo', data, 'POST')
}
/**
* 删除购物车
*/
export const deleteCart = (memberId, productCode) => {
var data = {
memberId: memberId,
productCode:productCode
}
return fetch('cancelCartProductInfo',data,'POST')
return fetch('cancelCartProductInfo?memberId=' + memberId, productCode, 'POST')
}
/**
* 购物车批量提交
@ -241,14 +237,8 @@ export const searchchanpin = (stype,usertype,curPage,curRow) => {
})
var str = "&";
for(var key in list){
str = str + key + "=" + list[key] + "&";
}
str = str.substr(0,str.length-1);
var data = {
page:1,
row:10
}
return fetch('product/query?petType='+usertype+str+queryTail, data, 'POST' )
}
@ -456,12 +446,17 @@ export const goodsmessage = (productCode) => {
//微信支付
export const generateOrderWX = (list) => {
var data = [{
}]
return fetch('generateOrderWX', list, 'POST')
}
//微信支付返回
export const updateOrderWX = (data) => {
return fetch('updateOrderWX', data, 'POST')
}
//支付宝支付
export const generateOrderAlipay = (list) => {
return fetch('generateOrderAlipay', list, 'POST')
}
//用户所有的优惠券
export const allConfig = (memberId, channelSecurity, mobile) => {
var data = {
@ -505,6 +500,11 @@ export const goodsmessage = (productCode) => {
// return fetch('generateOrderWX', data, 'POST' )
// }
//地址的查询
export const memberAddress = (type, data) => {
return fetch('memberAddress?type=' + type, data, 'POST')
}
//地址的查询
export const selectaddress = (memberId, pet, address) => {

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -0,0 +1,78 @@
* {
margin: 0;
padding: 0;
}
html {
line-height: 160%;
}
.rc_contline {
border-bottom: 3px solid #f6f6f6;
height: 0px;
margin: 0;
clear: both;
}
.page_modules {
padding-top: 100px;
}
.cont_modules {
margin: 0 auto;
max-width: 1400px;
}
.inline_right {
display: flex;
justify-content: space-between;
width: 100%;
}
.inline_mid {
display: flex;
justify-content: space-around;
width: 100%;
}
.inline_left {
display: flex;
justify-content: space-evenly;
width: 100%;
}
.li_inline {
li {
display: inline-block;
vertical-align: middle;
}
}
.color_red {
color: #E2001A;
}
.tc {
text-align: center;
}
.tr {
text-align: right;
}
.el-dialog{
width: 90%;
max-width: 440px;
}
#tns2-iw{ height: 90px;}
.rc-carousel:not(.rc-carousel--loaded){visibility:visible!important}
@media screen and (max-width: 768px) {
.el-message-box{
width: 300px;
}
.el-dialog{
width: 90%;
}
}

View File

@ -38,8 +38,10 @@ export default {
css: [
'vant/lib/index.css',
'element-ui/lib/theme-chalk/index.css',
'@/assets/style/default.less',
{ src:'@/assets/css/global.less'},
{ src:'@/assets/css/royalcanin-custom.css'},
{ src: "swiper/css/swiper.css" }
],
@ -73,7 +75,7 @@ export default {
],
styleResources: {
less: '@/assets/style/less/default.less' // less文件路径
less: '/assets/style/default.less' // less文件路径
},
// Build Configuration: https://go.nuxtjs.dev/config-build
build: {

View File

@ -0,0 +1,127 @@
<template>
<div>
<van-address-edit
:area-list="areaList"
:address-info="{
name: editAddressData.name,
tel: editAddressData.tel,
addressDetail: editAddressData.detailAddress,
areaCode: areaCode,
}"
show-delete
show-set-default
show-search-result
:search-result="searchResult"
@save="onSave"
@delete="onDelete"
/>
</div>
</template>
<script>
import { Toast } from "vant";
import { areaList } from "@vant/area-data";
var _ = require("lodash");
import { memberAddress } from "../../ajax/getData";
export default {
data() {
return {
areaList,
searchResult: [],
areaCode: "",
};
},
props: ["editAddressData"],
computed: {},
methods: {
async onSave(content) {
// Toast('save');
let provinceId = Number(content.areaCode.substring(0, 2)); //id
let cityId = Number(content.areaCode.substring(2, 4)); //id
let districtId = Number(content.areaCode.substring(4, 7)); //
//id / id/id/
let memberId = JSON.parse(localStorage.getItem("userInfo")).data.id;
let postData = {
memberId,
provinceId: 25,
cityId: 36,
districtId: 418,
// provinceId,
// cityId,
// districtId,
detailAddress: content.addressDetail,
recipient: content.name,
recipientPhone: content.tel,
default: content.default,
};
let saveType = this.editAddressData.saveType ? "update" : "add";
let data = await memberAddress(saveType, postData);
if (data) {
this.$message({
type: "warning",
message: data.msg,
});
if (data.code == "0") {
this.$emit("isClose", false);
}
}
},
async onDelete() {
// Toast("delete");
let postData = {
ids: this.editAddressData.id,
memberId: this.editAddressData.memberId,
};
let data = await memberAddress("delete", postData);
if (data) {
this.$message({
type: "warning",
message: data.msg,
});
if (data.code == "0") {
this.$emit("isClose", false);
}
}
},
async areaCodeInit() {
var city = this.editAddressData.city;
var district = this.editAddressData.district;
this.areaCode = "1310001";
// _.forEach(this.areaList.city_list, (o, c) => {
// if (o == city) {
// // let cityId = String(_.take(c, 2));
// let cityId = c.substring(0, 4);
// _.forEach(this.areaList.county_list, (i, a) => {
// if (i == district) {
// // let districtId = String(_.take(a, 2));
// let districtId = a.substring(0, 4);
// if (cityId == districtId) {
// this.areaCode = a;
// }
// }
// });
// }
// });
},
},
mounted() {
this.areaCodeInit();
},
};
</script>
<style>
.van-area {
width: 400px;
margin: 0 auto;
border: 1px solid #808285;
}
.van-popup {
background-color: transparent;
}
.van-overlay {
background-color: transparent;
}
.v-modal {
background: transparent;
}
</style>

View File

@ -1,89 +1,83 @@
<template>
<div>
<div class="rc-header">
<div class="rc-main">
<Myheader></Myheader>
<tabs></tabs>
<div class="rc-commodity">
<div class="rc-commondi">
<img src="../../assets/image/rc-select.png" alt="" />
<span>商品</span>
</div>
<div class="rc-main">
<tabs></tabs>
<div class="cart-list">
<div class="header">
<div class="list-left">
<label class="check-label">
<input type="checkbox" v-model="checkAll" />
</label>
<span class="name">商品</span>
</div>
<ul>
<li>单价</li>
<li>数量</li>
<li>操作</li>
</ul>
</div>
<div class="rc-select">
<label>
<input type="checkbox" v-model="checkAll">
全选
<div class="header_ph">
<el-row>
<el-col :span="12">
<div class="list-left">
<label class="check-label">
<input type="checkbox" v-model="checkAll" />
</label>
<div class="select-right">
<img src="../../assets/image/userupdate.png" alt="" />
<span @click="useredit">编辑</span>
<span class="name">全选</span>
</div>
</div>
<div>
<div v-for="(item, index) in goldmedal"
:key="index"
class="rc-userdemand"
</el-col>
<el-col :span="12" class="tr">
<span @click="editList()"
><i class="el-icon-edit"></i>{{ editState }}</span
></el-col
>
<div class="rc-userdeman">
<label>
<input type="checkbox" v-model="item.checked">
</el-row>
</div>
<div class="list" v-for="(item, index) in cartData" :key="index">
<div class="list-left">
<label class="check-label">
<input type="checkbox" v-model="item.checked" />
</label>
<!-- <img :src="item.image" /> -->
<!-- <img :src="checkone?require('../../assets/image/rc-unselect.png'):require('../../assets/image/rc-select.png')" @click="userclick(checkone,index)"/> -->
<img :src="item.productImg" alt="" class="re-message" />
<div class="product">
<div class="product-img">
<img :src="item.productImg" alt="" />
</div>
<div class="rc-userdem">
<div class="rc-userdema">
<span>{{ item.productName }}</span>
<em>规格:{{ item.specifications }}</em>
<div class="right">
<p class="product-title" v-text="item.productName"></p>
<p class="specifications">规格{{ item.specifications }}</p>
</div>
<div class="rc-userd">
<i>{{ item.productPrice }}</i>
</div>
</div>
<ul>
<li class="product-price">{{ item.productPrice }}</li>
<li>
<div class="rc-jia">
<img src="../../assets/image/userjian.png" alt="" @click="sub(item.buyCount,index)"/>
<strong> {{item.buyCount}} </strong>
<img src="../../assets/image/userjia.png" alt="" @click="plus(item.buyCount,index)" />
<img
src="../../assets/image/userjian.png"
alt=""
@click="sub(item.buyCount, index)"
/>
<input type="text" v-model="item.buyCount" />
<img
src="../../assets/image/userjia.png"
alt=""
@click="plus(item.buyCount, index)"
/>
</div>
<em @click="userdele(item,index)">删除</em>
</div>
</div>
<div class="rc-footer">
<div class="rc-foote">
<div class="rc-shop">
<i>总计:</i>
<span>{{ sumPrice }}</span>
</div>
<div class="rc-delete" @click="usejiesuan(item,index)">
<span>
{{ userdelete }}
</span>
</div>
</div>
</div>
</li>
<li class="del"><em @click="userdele(item)">删除</em></li>
</ul>
</div>
</div>
<div class="rc-footera">
<div class="rc-foote">
<div class="rc-shop">
<label>
<input type="checkbox" v-model="checkAll">
<input type="checkbox" v-model="checkAll" />
全选
</label>
</div>
@ -97,9 +91,8 @@
<em>共选择{{ sumlength }}件商品</em>
</div>
<strong @click="usejiesuan(item,index)" >{{mustpay}}</strong>
<strong @click="usejiesuan()">{{ mustpay }}</strong>
</div>
</div>
</div>
<!-- <div class="rc-shop">
@ -114,19 +107,15 @@
</div>
</div>
</div>
</div>
</template>
<script>
import { List } from 'vant';
import Myheader from "~/components/header.vue";
import tabs from "@/components/tabs.vue";
import instance from "@/config/request";
import { isexistCart, generateOrderWX, deleteCart } from "../../ajax/getData";
import accMul from "../../config/setDec.js"
export default {
middleware: 'metaTitle',
meta: {title: '购物车'},
middleware: "metaTitle",
meta: { title: "购物车" },
data() {
return {
ordersum: 1,
@ -137,13 +126,49 @@ export default {
ys1: true,
ys2: true,
userdelete: "结算",
orderprice:'¥199.00',
mustpay:'立即结算',
totalMoney:'',
orderprice: "¥199.00",
mustpay: "立即结算",
editState: "编辑",
dellist: [],
totalMoney: "",
allChecked: false,
userid: null,
cartData: [
// {
// buyCount: 3,
// id: 1,
// memberId: "1",
// productCode: "432434",
// productImg: require("../../assets/image/rc-select.png"),
// productName: "",
// productPrice: 399.0,
// specifications: "5KG",
// checked: false,
// },
// {
// buyCount: 1,
// id: 2,
// memberId: "2",
// productCode: "432434",
// productImg: require("../../assets/image/rc-select.png"),
// productName: "222",
// productPrice: "199.00",
// specifications: "5KG",
// checked: true,
// },
// {
// buyCount: 4,
// id: 3,
// memberId: "3",
// productCode: "432434",
// productImg: require("../../assets/image/rc-select.png"),
// productName: "3333",
// productPrice: 69.01,
// specifications: "5KG",
// checked: true,
// },
],
goldmedal: [
// {
// ordernumber: "1111111111111111111",
// orderstype: 1,
@ -156,18 +181,14 @@ export default {
// buttontitle: "",
// checked:true,
// userprice: "167",
// catimage: require("../../assets/image/rc-win.png"),
// },
// {
// ordernumber: "1111111111111111111",
// sales_num:1,
// usereat: "4",
// image:require('../../assets/image/rc-select.png'),
// checked:true,
// ordernum: 0,
// buttontitle: "",
// catimage: require("../../assets/image/usereat.png"),
@ -178,31 +199,28 @@ export default {
};
},
mounted() {
console.log('---');
this.goldmedal.forEach(item=>{
console.log("---");
this.goldmedal.forEach((item) => {
item.checked = true;
})
});
},
mounted() {
this.carmessage();
},
components: {
Myheader,
tabs
tabs,
},
methods: {
//
async carmessage() {
console.log(this.goldmedal);
let user = JSON.parse(localStorage.getItem("userInfo"));
console.log(user);
this.userid = user.data.id;
let data = await isexistCart(user.data.id);
this.goldmedal=data;
this.cartData = data;
// this.goldmedal = data;
},
async userjie(list) {
let user = JSON.parse(localStorage.getItem("userInfo"));
@ -211,39 +229,43 @@ export default {
let data = await generateOrderWX(list);
if (data) {
this.$message({
type: 'warning',
message: data.msg
type: "warning",
message: data.msg,
});
console.log(data);
this.$router.push({
path: "/personal/settlement",
query: {
wxdata:data.data
wxdata: data.data,
},
});
}
console.log(data);
},
//
async deletsmessage(productCode) {
let user = JSON.parse(localStorage.getItem("userInfo"));
console.log(user);
this.userid = user.data.id;
let data = await deleteCart(user.data.id,productCode);
let data = await deleteCart(this.userid, productCode);
if (data) {
this.$message({
type: 'warning',
message: data.msg
type: "warning",
message: data.msg,
});
this.carmessage();
}
},
editList() {
if (this.editState == "完成") {
this.mustpay = "立即结算";
this.editState = " 编辑";
} else {
this.mustpay = "删除";
this.editState = "完成";
}
},
// checkBox(){
// console.log(event.target.checked)
@ -253,107 +275,113 @@ export default {
// });
// },
// userdele(index){
// this.goldmedal.splice(index,1);
// },
userdele(item) {
let delform = [];
if (item.length > 0) {
delform = item;
} else {
delform = [item.productCode];
}
this.$confirm("确定删除", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "success",
callback: (action) => {
if (action === "confirm") {
this.deletsmessage(delform);
}
},
});
// this.$message({
// type: "warning",
// message: data.msg,
// });
},
plus(num, index) {
console.log(index);
this.goldmedal[index].buyCount = parseInt(this.goldmedal[index].buyCount) + 1;
this.cartData[index].buyCount =
parseInt(this.cartData[index].buyCount) + 1;
},
//
sub(num, index) {
if (parseInt(num) <= 1) {
this.goldmedal[index].buyCount = 1;
this.cartData[index].buyCount = 1;
} else {
this.cartData[index].buyCount =
parseInt(this.cartData[index].buyCount) - 1;
}
else{
this.goldmedal[index].buyCount = parseInt(this.goldmedal[index].buyCount) - 1;
}
},
//
useredit(e) {
this.ys1 = !this.ys1
this.ys1 = !this.ys1;
if (this.ys1 == false) {
this.$nextTick(() => {
this.userdelete='删除';
this.userdelete = "删除";
console.log(this.userdelete);
})
});
} else if (this.ys1 == true) {
this.$nextTick(() => {
this.userdelete='结算';
this.userdelete = "结算";
console.log(this.userdelete);
})
});
}
if (this.userdelete == "删除") {
}
},
usejiesuan(item,index){
usejiesuan() {
// let procode = [];
// let list = [];
// let menulist = [];
// this.cartData.filter((item) => {
// if (item.checked) {
// list.push(item);
// console.log(item);
// procode.push(item.productCode);
// } else {
// list.splice(index, 1);
// }
// });
// let list = [];
// list = this.cartData.filter((item) => item.checked);
let procode=[];
// list.forEach((item) => {
// menulist.push({
// productName: item.productName,
// buyCount: item.buyCount,
// productId: item.productCode,
// payAmount: item.productPrice,
// memberId: item.memberId,
// phoneNumber: item.mobile,
// });
// });
let list = [];
let menulist=[];
this.goldmedal.filter(item=>{
if(item.checked){
list.push(item);
console.log(item);
procode.push(item.productCode)
list = this.cartData.filter((item) => item.checked);
if (list.length == 0) {
this.$message({
type: "warning",
message: "你还未选择商品",
});
return;
} else {
list.splice(index,1);
}
})
list=this.goldmedal.filter(item =>
item.checked
);
if (this.editState == "完成") {
let delList=[]
list.forEach(item=>{
menulist.push({
productName:item.productName,
buyCount:item.buyCount,
productId: item.productCode,
payAmount: item.productPrice,
memberId:item.memberId,
phoneNumber:item.mobile
});
});
if(this.ys1==false){
if(list.length==0){
this.$message({
type: 'warning',
message: '你还未选择商品'
});
return;
delList.push(item.productCode)
})
this.userdele(delList);
} else {
this.deletsmessage(procode);
}
}else{
if(list.length==0){
this.$message({
type: 'warning',
message: '你还未选择商品'
this.$router.push({
path: "/personal/settlement",
query: {
list: list,
},
});
return;
}else{
this.userjie(menulist)
}
}
// list=[
// {
// "productName":"",
@ -378,10 +406,6 @@ plus(num,index){
// .then((res) => {
// console.log(res);
// });
},
// async userdelete(item) {
@ -394,242 +418,43 @@ plus(num,index){
checkAll: {
// ,
set(v) {
this.goldmedal.forEach(item => {
item.checked = v
this.cartData.forEach((item) => {
item.checked = v;
});
},
// ,
get() {
return this.goldmedal.length === this.goldmedal.filter(item => item.checked == true).length;
return (
this.cartData.length ===
this.cartData.filter((item) => item.checked == true).length
);
},
},
//
sumPrice() {
return this.goldmedal
.filter(item => item.checked)
return this.cartData
.filter((item) => item.checked)
.reduce((pre, cur) => {
console.log(pre);
return pre + cur.buyCount * cur.productPrice;
}, 0);
},
sumlength() {
return this.goldmedal.filter(item => item.checked == true).length;
}
return this.cartData.filter((item) => item.checked == true).length;
},
},
};
</script>
<style lang="less" scoped>
//
@media screen and(min-width: 320px) and(max-width:768px) {
.rc-header{
.rc-footer {
display: none;
}
.rc-footera {
display: none;
}
.rc-footer {
position: fixed;
bottom: 0;
width: 100%;
.rc-foote {
width: 100%;
margin: 0 auto;
height: 80px;
display: flex;
justify-content: space-between;
align-items: center;
background-color: white;
}
.rc-shop {
display: flex;
align-items: center;
i {
font-style: normal;
font-size: 14px;
color: #333333;
}
span {
font-size: 18px;
color: #E1001A;
display: block;
margin-left: 3px;
}
}
.rc-delete {
span {
width: 100px;
height: 48px;
background: #e2001a;
border-radius: 30px;
display: flex;
justify-content: center;
align-items: center;
font-size: 14px;
margin-right: 40px;
color: #ffffff;
}
}
}
.rc-header {
width: 100%;
.rc-main {
width: 92%;
margin: 0 auto;
.rc-commodity{
display: none;
}
.rc-select {
border-bottom: 1px solid #d8d8d8;
height: 56px;
width: 100%;
align-items: center;
display: flex;
justify-content: space-between;
.select-left {
display: flex;
align-items: center;
img {
width: 24px;
height: 24px;
display: block;
}
span {
font-size: 14px;
color: #333333;
display: block;
margin-left: 8px;
}
}
.select-right {
display: flex;
align-items: center;
img {
width: 16px;
height: 16px;
display: block;
margin-right: 8px;
}
span {
font-size: 14px;
color: #333333;
}
}
}
.rc-userdemand {
width: 100%;
height: 180px;
border-bottom: 1px solid #d8d8d8;
display: flex;
.rc-userdeman {
display: flex;
align-items: center;
img {
width: 24px;
height: 24px;
display: block;
}
.re-message {
width: 96px;
height: 96px;
display: block;
border: 1px solid #d8d8d8;
margin-left: 8px;
}
}
.rc-userdem {
display: flex;
flex-direction: column;
width: 100%;
margin-left: 8px;
justify-content: center;
span {
font-size: 16px;
color: #e1001a;
display: block;
font-weight: bold;
}
em {
font-style: normal;
font-size: 14px;
display: block;
margin-top: 8px;
color: #666666;
}
.rc-userd {
em{
display: none;
}
display: flex;
align-items: center;
justify-content: flex-end;
margin-top: 8px;
i {
font-size: 18px;
font-style: normal;
display: flex;
justify-content: flex-start;
align-items: center;
width: 74%;
color: #e1001a;
}
img {
width: 23px;
height: 23px;
display: block;
margin-right: 4px;
}
img:last-child {
width: 23px;
height: 23px;
display: block;
margin-left: 4px;
}
strong {
font-style: normal;
display: flex;
justify-content: center;
list-style: none;
align-items: center;
width: 24px;
color: #666666;
height: 24px;
background: #f6f6f6;
border: 1px solid #d7d7d7;
font-size: 12px;
border-radius: 3px;
}
.rc-jia{
display: flex;
}
}
}
}
}
}
}
// /* 768px1920 *pc/
@media screen and (min-width: 768px) and (max-width: 1920px) {
.rc-footer{
display: none;
}
.rc-footera {
position: fixed;
bottom: 0;
width: 100%;
.rc-foote {
width: 92%;
margin: 0 auto;
box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
height: 102px;
@ -639,6 +464,7 @@ plus(num,index){
.rc-shop {
display: flex;
align-items: center;
margin-left: 24px;
img {
width: 24px;
height: 24px;
@ -680,7 +506,7 @@ display: block;
}
span {
font-size: 20px;
color: #E1001A;
color: #e1001a;
}
em {
font-style: normal;
@ -705,42 +531,92 @@ height: 48px;
}
}
}
.rc-header {
width: 100%;
.rc-main {
width: 92%;
margin: 0 auto;
.rc-commodity {
padding-top: 60px;
max-width: 1400px;
.cart-list {
width: 100%;
border: 1px solid #d7d7d7;
border-radius: 3px 3px 0px 0px;
background: #f6f6f6;
font-size: 18px;
font-size: 16px;
color: #666666;
p {
margin: 0;
}
.header {
background: #f6f6f6;
border-radius: 3px 3px 0px 0px;
border-bottom: 1px solid #d7d7d7;
height: 64px;
display: flex;
justify-content: space-between;
.rc-commondi {
display: flex;
align-items: center;
img {
}
.header_ph {
display: none;
}
.check-label {
display: block;
margin-left: 24px;
}
span {
.name {
display: block;
margin-left: 56px;
}
.list-left {
display: flex;
align-items: center;
}
ul {
display: flex;
width: 80%;
width: 70%;
justify-content: space-around;
align-items: center;
}
.list {
display: flex;
justify-content: space-between;
border-bottom: 1px solid #d7d7d7;
padding: 15px 0;
.product-price {
color: #e1001a;
font-weight: bold;
font-size: 20px;
}
.product {
display: flex;
justify-content: space-between;
margin-left: 56px;
.product-title {
color: #e1001a;
font-weight: bold;
font-size: 18px;
}
.product-img {
margin-right: 10px;
width: 96px;
height: 96px;
img {
width: 24px;
height: 24px;
width: 100%;
height: 100%;
}
}
}
.rc-jia {
display: flex;
align-items: center;
img,
input {
width: 30px;
height: 30px;
text-align: center;
margin: 0 5px;
}
input {
border: 1px solid #d7d7d7;
}
}
}
}
.rc-select {
@ -828,7 +704,6 @@ height: 48px;
flex-direction: column;
justify-content: center;
width: 10%;
}
.rc-userd {
display: flex;
@ -860,10 +735,10 @@ height: 48px;
font-style: normal;
font-size: 20px;
cursor: pointer;
border-bottom: 1px solid #E2001A;
border-bottom: 1px solid #e2001a;
display: block;
margin-left: 40px;
color: #E1001A;
color: #e1001a;
}
strong {
font-style: normal;
@ -883,6 +758,66 @@ color: #E1001A;
}
}
}
//
@media screen and (max-width: 768px) {
.rc-main {
width: 100%;
.cart-list {
border: none;
.header {
display: none;
}
.header_ph {
display: block;
border-bottom: 2px solid #d8d8d8;
padding: 20px 10px 20px 0;
border-top: 5px solid #f6f6f6;
}
.check-label {
margin-left: 10px;
}
.name {
margin-left: 16px;
}
.list {
display: block;
.product {
margin-left: 16px;
}
ul {
margin-top: -32px;
margin-left: 128px;
width: 60%;
.del {
display: none;
}
}
}
}
}
.rc-footera {
position: fixed;
bottom: 0;
width: 100%;
.rc-shop {
display: none;
}
.rc-delete {
margin-right: 0;
width: 100%;
.rc-num {
width: 100%;
justify-content: space-between;
padding: 10px;
}
strong {
margin-right: 0;
}
}
}
.el-message-box{
width: 300px;
}
}
</style>

View File

@ -0,0 +1,414 @@
ul li ol li em strong i {
list-style: none;
font-style: normal;
}
.rc-header {
width: 100%;
}
.settlement {
padding-top: 100px;
}
.rc-main {
width: 92%;
margin: 0 auto;
max-width: 1400px;
.rc-userbottomm {
display: none;
}
.rc-border {
width: 100%;
border-bottom: 1px solid #d7d7d7;
margin-top: 32px;
}
.rc-receiving {
width: 100%;
height: 80px;
display: flex;
flex-direction: column;
em {
font-style: normal;
color: #e1001a;
font-size: 26px;
}
span {
color: #666666;
font-size: 16px;
display: block;
margin-top: 25px;
}
}
.delivery {
display: flex;
flex-direction: column;
height: 140px;
display: flex;
justify-content: center;
.viewdetails {
display: flex;
align-items: center;
justify-content: flex-end;
span {
color: #444444;
font-size: 18px;
display: block;
margin-right: 8px;
}
img {
width: 8px;
height: 16px;
}
}
.to-delivery {
display: flex;
align-items: center;
font-style: normal;
span {
display: block;
// margin-left: 16px;
font-size: 18px;
color: #333333;
}
i {
font-style: normal;
margin-left: 8px;
display: block;
font-size: 18px;
color: #999999;
}
}
.bo-delivery {
span {
font-size: 16px;
color: #666666;
display: block;
margin-top: 16px;
}
}
}
.address-list {
display: flex;
.mypersonal {
display: flex;
flex-direction: column;
justify-content: center;
border: 1px solid #808285;
height: 118px;
width: 320px;
padding: 15px;
color: #333333;
margin: 20px 40px 20px 0;
position: relative;
cursor: pointer;
&.active {
border: 1px solid #E2001A;
}
.edit {
position: absolute;
top: 5px;
right: 8px;
display: none;
cursor: pointer;
}
&:hover {
.edit {
display: block;
}
}
.my-delivery {
display: flex;
align-items: center;
font-style: normal;
span {
display: block;
margin-left: 3px;
}
i {
font-style: normal;
margin-left: 3px;
display: block;
}
}
.per-delivery {
span {
color: #666666;
display: block;
margin-top: 5px;
}
}
}
}
.rc-usermain {
display: flex;
padding: 20px 0;
.rc-image {
border: 1px solid #d8d8d8;
margin-right: 20px;
img {
width: 96px;
height: 96px;
display: block;
}
}
.rc-right {
.rc-usercenter {
display: flex;
justify-content: center;
flex-direction: column;
h3,
.price {
font-style: normal;
display: block;
font-size: 18px;
font-weight: bold;
margin-top: 17px;
color: #e1001a;
}
}
display: flex;
justify-content: space-between;
width: 100%;
}
.rc-userright {
display: flex;
flex-direction: column;
color: #666666;
font-size: 16px;
span {
display: block;
margin-top: 16px;
font-size: 16px;
}
}
.rc-userbottom {
display: flex;
width: 60%;
justify-content: space-between;
align-items: center;
.price {
font-style: normal;
color: #e1001a;
font-size: 20px;
font-weight: bold;
}
}
}
.rc-merchandise {
padding: 15px 0;
&::after {
display: block;
content: '';
clear: both;
}
ul {
width: 25%;
display: flex;
flex-direction: column;
justify-content: space-between;
line-height: 40px;
float: right;
i {
font-style: normal;
color: #666666;
}
li {
list-style: none;
font-style: normal;
display: flex;
justify-content: space-between;
span {
color: #333333;
}
}
li .red {
color: #e1001a;
font-size: 20px;
font-style: normal;
}
}
}
.rc-payment {
width: 100%;
margin-top: 80px;
.u-trackingnumber {
display: flex;
align-items: center;
i {
font-size: 18px;
font-style: normal;
margin-right: 16px;
}
img {
width: 8px;
height: 16px;
}
}
ul {
width: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
line-height: 40px;
font-size: 18px;
i {
font-style: normal;
color: #666666;
display: block;
}
li {
list-style: none;
font-style: normal;
display: flex;
justify-content: space-between;
span {
color: #333333;
}
}
}
}
.rc-foot {
display: flex;
flex-direction: column;
.rc-foo {
display: flex;
justify-content: flex-end;
flex-direction: column;
align-items: self-end;
i {
font-style: normal;
color: #333333;
font-size: 20px;
margin-right: 20px;
}
em {
font-style: normal;
color: #e1001a;
font-size: 26px;
}
span {
display: block;
width: 164px;
margin-top: 36px;
background: #e2001a;
line-height: 48px;
text-align: center;
color: white;
font-size: 16px;
height: 48px;
border-radius: 30px;
}
}
}
}
.diallog_width{
width: 100%;
max-width: 440px;
}
.el-dialog{
width: 100%;
}
//手机端
@media screen and (max-width: 768px) {
.diallog_width{
width: 100%;
}
.rc-main {
.address-list {
display: contents;
.mypersonal {
width: 100%;
height: auto;
}
}
.rc-usermain {
.rc-right { display: table}
}
.rc-merchandise{
padding: 15px 0 120px;
ul{
float: none;
width: 100%;
}
}
.rc-foot{
.rc-foo{
display: flex;
justify-content: space-around;
flex-direction: row;
align-items: self-end;
position: fixed;
bottom: 0;
background: #fff;
width: 100%;
padding: 10px;
}
}
}
}

View File

@ -1,5 +1,5 @@
<template>
<div>
<div class="settlement">
<Myheader></Myheader>
<tabs></tabs>
<div class="online"></div>
@ -8,52 +8,55 @@
<div class="rc-border"></div>
<div
class="mypersonal"
v-for="(dataaddress, index) in useraddress"
v-for="(item, index) in useraddress"
:key="index"
:class="item.isDefault ? 'active' : ''"
@click="selectAddress(item)"
>
<div class="edit" @click="editAddress(item)">
<i class="el-icon-edit"></i>编辑
</div>
<div class="my-delivery">
<span>{{ dataaddress.state }}</span>
<i>{{ dataaddress.tel }}</i>
<span>{{ item.recipient }}</span>
<i>{{ item.recipientPhone }}</i>
</div>
<div class="per-delivery">
<span>{{ dataaddress.address }}</span>
<span>{{ item.address }}</span>
</div>
</div>
<div class="online" style="height:3px;width:100%;background:#DDDDDD;"></div>
<div>
<div class="rc-center">
<div class="mypersonal">
<div
class="my-delivery"
@click="addAddress"
style="justify-content: center"
>
<i class="el-icon-plus"></i>
<span>添加收货地址</span>
</div>
</div>
</div>
</div>
<div class="rc-contline"></div>
<div class="rc-main" v-for="(item, index) in goldmedal" :key="index">
<div class="rc-usermain">
<div class="rc-image">
<img :src="item.catimage" alt="" />
<img :src="item.productImg" alt="" />
</div>
<div class="rc-right">
<div class="rc-usercenter">
<em>{{ item.usereat }}</em>
<div class="rc-userright">
<span>规格:{{ item.num }}</span>
</div>
<h3>{{ item.productName }}</h3>
<p>规格:{{ item.specifications }}</p>
</div>
<div class="rc-userbottom">
<span>数量:{{ item.specification }}</span>
<i>{{ item.userprice }}</i>
<div class="rc-bottom">
<span>联系客服申请售后</span>
<p>{{ item.productPrice }}</p>
<p>X{{ item.buyCount }}</p>
<p class="price">{{ item.productPrice }}</p>
</div>
</div>
<div class="rc-bottomm">
<span>联系客服申请售后</span>
</div>
<!-- <div class="rc-userbottomm">
<i>{{ item.userprice }}</i>
<span>{{ item.orderstype }}</span>
<i>{{ item.userprice }}</i>
</div> -->
</div>
</div>
</div>
<div class="rc-contline"></div>
<div class="rc-main">
<div class="rc-merchandise">
<ul>
<li>
@ -66,40 +69,38 @@
</li>
<li>
<span>商品总价:</span>
<i>{{ shopprice.promotion }}</i>
<i class="red">{{ sumPrice }}</i>
</li>
<li>
<span>配送费用:</span>
<i>{{ shopprice.payment }}</i>
<i class="red">{{ shopprice.payment }}</i>
</li>
</ul>
</div>
</div>
<div class="rc-contline"></div>
<div class="rc-main">
<div class="rc-foot">
<div class="rc-foo">
<div style="padding-top:55px">
<div>
<i>合计金额:</i>
<em>167.00</em>
<em>{{ sumPrice }}</em>
</div>
<div style="padding-bottom:40px">
<span>再次购买</span>
<div style="font-weight: bold">
<span @click="jiesuan()">提交订单</span>
</div>
</div>
</div>
</div>
</div>
<div class="rc-button">
<div class="rc-left">
<span>总计</span>
<em>167.00</em>
</div>
<strong ref="rccolor" @click="jiesuan">结算</strong>
<el-dialog :visible.sync="dialogAdd" class="diallog_width" width="'100%">
<div class="tc dl_cont" v-if="dialogAdd">
<myAddress
@isClose="dialogCtrl"
:editAddressData="editAddressData"
></myAddress>
</div>
</el-dialog>
</div>
</template>
@ -114,21 +115,16 @@ export default {
return {
goldmedal: [],
addressstype: null,
orderstatus: '',
userisdelivery:'待收货',
orderstatus: "",
userisdelivery: "待收货",
userdelivery: "派送中",
isshow: true,
leftico: require("../../assets/image/rc-left.png"),
orderNumber:'',
// delivery: [
// {
// state: "",
// time: "2021-11-21",
// address: "广15124617917",
// },
// ],
orderNumber: "",
dialogAdd: false,
editAddressData: {},
curAddress: {},
saveType: "",
useraddress: [
{
state: "李某某",
@ -170,26 +166,149 @@ export default {
promotion: "¥167.00",
payment: "¥0.00 ",
},
information: {
reference: "1111111111111111",
ordertime: "2012-12-01 11:20:00",
paymentmethod: "微信支付",
distribution: "快递",
trackingnumber: "11111111111111",
catimage: require("../../assets/image/rc-left.png"),
},
};
},
computed: {
//
sumPrice() {
return this.goldmedal
.reduce((pre, cur) => {
console.log(pre);
return pre + cur.buyCount * cur.productPrice;
}, 0);
},
},
methods: {
jiesuan(){
// let userdata=this.$route.query.wxdata
async getAddressList() {
let memberId = JSON.parse(localStorage.getItem("userInfo")).data.id;
let { data } = await memberAddress("getAll", { memberId: memberId });
data.forEach((item) => {
item.address =
item.provinceName +
item.cityName +
item.districtName +
item.detailAddress;
});
this.useraddress = data;
console.log(data);
},
editAddress(item) {
this.editAddressData = {
memberId: item.memberId,
name: item.recipient,
tel: item.recipientPhone,
detailAddress: item.detailAddress,
id: item.id,
city: item.cityName,
districtId: item.districtName,
saveType: "edit",
};
this.dialogAdd = true;
},
addAddress() {
this.editAddressData = {};
this.dialogAdd = true;
},
selectAddress(cur) {
this.useraddress.forEach((item) => {
if (item.id == cur.id) {
item.isDefault = true;
} else {
item.isDefault = false;
}
});
},
dialogCtrl(parm) {
this.dialogAdd = parm;
this.getAddressList();
},
async jiesuan() {
let orderAddress = this.useraddress.filter(item=>item.isDefault)
let postData =[]
this.goldmedal.forEach(item=>{
let oneProduct={
productName: item.productName,
buyCount: item.buyCount,
productId:item. productCode,
payAmount: item.productPrice,
memberId: item.memberId,
phoneNumber: item.mobile,
// couponId: "NGQ2022P12",
// couponTypeId: "4",
// couponName: "",
// couponAmount: "0.3175",
// couponCode: "0007792402",
orderAddress: {
addressPhoneNumber:orderAddress[0].recipientPhone,
addressUserName:orderAddress[0].recipient,
addressProvinceName: orderAddress[0].provinceName,
addressCityName:orderAddress[0].cityName,
addressCountyName: orderAddress[0].districtName,
addressDetailInfo: orderAddress[0].detailAddress,
},
}
postData.push(oneProduct)
})
// let postData = [
// {
// productName: this.goldmedal.productName,
// buyCount: "2",
// productId: "20030200",
// payAmount: "147.00",
// memberId: "844350",
// phoneNumber: "18112621098",
// couponId: "NGQ2022P12",
// couponTypeId: "4",
// couponName: "",
// couponAmount: "0.3175",
// couponCode: "0007792402",
// orderAddress: {
// addressPhoneNumber:orderAddress[0].recipientPhone,
// addressUserName:orderAddress[0].recipient,
// addressProvinceName: orderAddress[0].provinceName,
// addressCityName:orderAddress[0].cityName,
// addressCountyName: orderAddress[0].districtName,
// addressDetailInfo: orderAddress[0].detailAddress,
// },
// },
// // {
// // productName: "",
// // buyCount: "2",
// // productId: "20030200",
// // payAmount: "147.00",
// // memberId: "844350",
// // phoneNumber: "18112621098",
// // couponId: "NGQ2022P12",
// // couponTypeId: "4",
// // couponName: "",
// // couponAmount: "0.3175",
// // couponCode: "0007792402",
// // orderAddress: {
// // addressPhoneNumber: "13602898745",
// // addressUserName: "",
// // addressProvinceName: "",
// // addressCityName: "",
// // addressCountyName: "",
// // addressDetailInfo: "",
// // },
// // },
// ];
// let res = await generateOrderWX(postData);
// if (res.success) {
// let payData=res.data
let userPayData={
postData:postData,
wxPay:'weixin://wxpay/bizpayurl?pr=4RJbokxzz'
}
this.$router.push({
path: "/personal/userpay",
query: {
wxdata:userdata
userPayData: userPayData,
},
});
// }
},
async canceldanhao(orderNumber) {
let data = await userin(orderNumber);
@ -199,11 +318,14 @@ jiesuan(){
},
},
mounted() {
this.addressstype = this.$route.query.stype;
this.orderNumber=this.$route.query.orderNumber;
this.canceldanhao(this.orderNumber)
console.log(this.$refs.rccolor)
this.$refs.rccolor.style.background='gray';
this.goldmedal = this.$route.query.list;
console.log(this.$route.query.list);
this.getAddressList();
// this.addressstype = this.$route.query.stype;
// this.orderNumber = this.$route.query.orderNumber;
// this.canceldanhao(this.orderNumber);
// console.log(this.$refs.rccolor);
// this.$refs.rccolor.style.background = "gray";
},
components: {
Myheader,

View File

@ -1,578 +1,320 @@
<template>
<div>
<div class="page_modules">
<Myheader></Myheader>
<div class="rc-main">
<div class="online" style="height:3px;width:93%;margin:0 auto;background:#DDDDDD;margin-top:0.23rem"></div>
<div class="rc-hearder">
<div class="rc-userpay">
<div class="paysucess">
<span>订单提交成功等待付款</span>
<div class="cont_modules">
<tabs></tabs>
<el-row class="order_info">
<el-col :span="6" class="ph_hidden">
<ul class="li_inline">
<li class="sucess_img">
<img src="../../assets/image/usersucess.png" alt="" />
</li>
<li class="ready">
<p>订单提交成功</p>
<p>等待付款</p>
</li>
</ul>
</el-col>
<el-col :span="12" class="ph_hidden">&nbsp;</el-col>
<el-col :span="6" class="ready_right">
<div class="inline_right">
<p>付款金额:</p>
<p class="price">{{ info.userprice }}</p>
</div>
<div class="rc-all">
<div class="rc-payprice">
<span>付款金额:</span>
<i>{{ userprice }}</i>
<div class="inline_right">
<p>收货信息:</p>
<p>{{ info.userinformation }}</p>
</div>
<div class="rc-receiving">
<span>收货信息:</span>
<i>{{ userinformation }}</i>
</el-col>
</el-row>
</div>
<div class="rc_contline"></div>
<div class="cont_modules">
<div class="pay_title color_red">请选择支付方式</div>
</div>
<div class="online" style="height:3px;width:100%;background:#DDDDDD;"></div>
<div class="rc-usermaina">
<div class="rc-title" id="qrcode" ref="qrcode" >
</div>
</div>
</div>
<div class="rc-paystype">
<span>请选择支付方式</span>
</div>
<div class="online" style="height:3px;width:100%;background:#DDDDDD;"></div>
<div class="paystype">
<div
class="payAlipay"
<div class="rc_contline"></div>
<div class="cont_modules">
<div class="pay_list">
<ul>
<li
class="pay_item"
v-for="(item, index) in userpaystype"
:key="index"
@click="selectGoods(item, index)"
:class="activeIndex == index ? 'active' : 'unactive'"
:class="activeIndex == index ? 'active' : ''"
>
<div class="rc-payype">
<img :src="item.payimage" alt="" />
<span>{{ item.price }}</span>
</div>
<div class="user-righticon">
<img src="../../assets/image/rc-left.png" alt="" />
</div>
</div>
<span>{{ item.paytype }}支付</span>
</li>
</ul>
</div>
</div>
<div class="paycord" @click="usershow()" id="qrcode" ref="qrcode">
<!-- <img src="../../assets/image/rc-discount.png" alt="" />
<span>微信扫一扫立即支付</span> -->
<div class="paycord">
<div id="qrcode" ref="qrcode" class="qrcode"></div>
<span>{{ paytype }}扫一扫立即支付</span>
</div>
</div>
<el-dialog
:visible.sync="dialogInfo1"
hegight="700px"
@close='closeDialog'
:visible.sync="dialogSuccess"
@close="closeDialogSuccess"
>
<div class="rc-header">
<div class="rc-titled" >
<img src="../../assets/image/usersucess.png" alt="">
<div class="tc dl_cont">
<div class="dl_img">
<img src="../../assets/image/usersucess.png" alt="" />
</div>
<div class="rc-logmain">
<h3>支付成功</h3>
<span>{{usermessage}}</span>
</div>
<h3 class="title">支付成功</h3>
<p>您的商品我们正在抓紧打包请耐心等候</p>
<div class="line_dashed"></div>
<div class="userer">
<img src="../../assets/image/rc-discount.png" alt="">
<span>微信扫一扫识别二维码</span>
<i>加入社群0元试用商品随单发放</i>
<img
width="210"
height="210"
src="../../assets/image/rc-discount.png"
alt=""
/>
<p>微信扫一扫识别二维码</p>
<p class="tips">加入社群0元试用商品随单发放</p>
</div>
</div>
</el-dialog>
<el-dialog
:visible.sync="dialogFail"
@close="closeDialogFail"
>
<div class="tc dl_cont">
<div class="dl_img">
<img src="../../assets/pay/fail.png" alt="" />
</div>
<h3 class="title">支付失败</h3>
<p>请返回商品结算页面重新支付</p>
</div>
</el-dialog>
</div>
</template>
<script>
import Myheader from "~/components/header.vue";
import QRCode from 'qrcodejs2'
import { generateOrderWX } from "../../ajax/getData";
import tabs from "@/components/tabs.vue";
import QRCode from "qrcodejs2";
import { generateOrderAlipay, updateOrderWX } from "../../ajax/getData";
export default {
data() {
return {
userdata:null,
activeIndex: 0,
usermessage:'您的商品我们正在抓紧打包,请耐心等候!',
userprice: "¥167.00",
userinformation: "李某某 151****7917",
isSucess: false,
paytype: "微信",
userpaystype: [
{
price: "支付宝支付",
payimage: require("../../assets/image/rc-cat.png"),
catimage: require("../../assets/image/rc-left.png"),
paytype: "微信",
payimage: require("../../assets/pay/wx.png"),
},
{
price: "微信支付",
payimage: require("../../assets/image/rc-cat.png"),
catimage: require("../../assets/image/rc-left.png"),
paytype: "支付宝",
payimage: require("../../assets/pay/zfb.png"),
},
],
dialogInfo1:false,
dialogSuccess: true,
dialogFail: false,
};
},
computed: {
//
info() {
let obj = {
userprice: this.$route.query.userPayData.postData[0].payAmount,
userinformation:
this.$route.query.userPayData.postData[0].orderAddress
.addressUserName +
" " +
this.$route.query.userPayData.postData[0].orderAddress
.addressPhoneNumber,
};
return obj;
},
},
mounted() {
this.userdata=this.$route.query.wxdata;
this.userpay(this.userdata);
console.log(this.userdata);
this.$nextTick(() => {
this.userpay();
})
this.qrcode(this.$route.query.userPayData.wxPay);
},
methods: {
closeDialog(){
closeDialogSuccess() {
this.qrcode = null;
console.log('关闭的')
this.$router.push({
path: "/index",
});
},
async userpay(userdata) {
console.log("-----");
let data = await generateOrderWX();
console.log();
this.qrcode(userdata);
closeDialogFail() {
this.qrcode = null;
this.$router.push({
path: "/personal/useraddress",
});
},
qrcode(e) {
console.log(e);
let qrcode = new QRCode('qrcode',{
width: 150, //
height: 150, //
text: e//
})
let qrcode = new QRCode("qrcode", {
width: 260, //
height: 260, //
text: e, //
});
},
selectGoods(item,index){
let _that=this
_that.dialogInfo1=true;
_that.activeIndex=index;
if(item.price=='微信支付'){
// this.userpay();
async selectGoods(item, index) {
this.activeIndex = index;
this.paytype = item.paytype;
if (index == 1) {
//
let res = await generateOrderAlipay(
this.$route.query.userPayData.postData
);
if (res.success) {
this.qrcode(res.data);
}
}
},
usershow(){
console.log('这是支付')
this.dialogInfo1=true;
//
async updateOrderWX() {
let res = await updateOrderWX();
if (res.success) {
this.dialogSuccess = true;
clearInterval(this.time);
} else {
this.dialogFail = true;
clearInterval(this.time);
}
},
},
components: {
Myheader,
tabs,
},
};
</script>
<style lang="less" scoped >
@media screen and (max-width: 768px) {
.rc-usermaina{
width: 100%;
display: flex;
align-items: center;
justify-content: center;
display: none;
}
.rc-userpay{
display: none;
}
/deep/.el-dialog {
width:80%;
height: 500px;
}
.rc-header{
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
h3{
color:#333333;
font-size: 26px;
}
.rc-title{
display: flex;
margin-top: 30px;
display: none;
img{
.sucess_img {
width: 96px;
height: 96px;
margin-left: 40px;
margin-right: 10px;
}
.order_info {
padding: 10px 0;
}
.rc-titled{
img{
width: 96px;
height: 96px;
}
}
.userer{
display: flex;
flex-direction: column;
align-items: center;
img{
width: 96px;
height: 96px;
display: flex;
justify-content: center;
flex-direction: column;
}
span{
font-size: 16px;
color: #333333;
}
i{
font-size: 18px;
font-style: normal;
display: block;
margin-top: 32px;
color: #E1001A;
}
}
}
.rc-main {
width: 100%;
margin-top: 24%;
.paysucess{
display: none;
}
.paycord{
display: none;
}
.rc-hearder {
width: 93%;
margin: 0 auto;
i em {
font-style: normal;
}
.rc-userpay {
width: 100%;
// height: 96px;
display: flex;
flex-direction: column;
justify-content: center;
.rc-all{
height: 96px;
display: flex;
flex-direction: column;
justify-content: center;
// display: none;
}
.rc-payprice {
.info {
display: flex;
justify-content: space-between;
span {
font-size: 14px;
color: #333333;
}
i {
font-size: 14px;
font-style: normal;
color: #e1001a;
}
}
.rc-receiving {
margin-top: 8px;
display: flex;
justify-content: space-between;
span {
font-size: 14px;
color: #333333;
}
i {
font-style: normal;
color: #666666;
font-size: 14px;
}
}
strong {
font-size: 16px;
display: block;
margin-top: 53px;
color: #e1001a;
}
}
.rc-paystype {
height:64px;
display: flex;
align-items: center;
span {
font-size: 16px;
color: #e1001a;
}
}
.payAlipay {
.user-righticon{
display: flex;
align-items: center;
img{
width: 8px;
height: 16px;
}
}
display: flex;
justify-content: space-between;
height: 80px;
border-bottom: 1px solid #d8d8d8;
.rc-payype {
display: flex;
align-items: center;
img {
width: 32px;
height: 32px;
border-radius: 50%;
}
span {
color: #333333;
font-size: 14px;
margin-left: 16px;
}
}
}
}
}
}
@media screen and (min-width: 768px) and (max-width: 1920px) {
.rc-usermaina{
width: 100%;
display: flex;
align-items: center;
justify-content: center;
display: block;
}
/deep/.el-dialog {
width: 440px;
height: 677px;
}
.rc-header{
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
h3{
color:#333333;
font-size: 26px;
}
.rc-titled{
img{
width: 96px;
height: 96px;
}
}
.rc-title{
position: absolute;
left: 50%;
margin-left: -75px;
display: block;
top: 59%;
img{
width: 96px;
height: 96px;
}
}
.userer{
img{
width: 210px;
height: 210px;
display: flex;
justify-content: center;
flex-direction: column;
}
span{
font-size: 16px;
color: #333333;
}
i{
font-size: 18px;
font-style: normal;
display: block;
margin-top: 32px;
color: #E1001A;
}
}
}
.rc-main {
.active {
border: 1px solid #E2001A;
cursor: pointer;
width: 200px;
height: 56px;
}
.unactive {
border:1px solid #3D3D3D;
cursor: pointer;
width: 200px;
height: 56px;
}
width: 100%;
.rc-hearder {
width: 93%;
margin: 0 auto;
i em {
font-style: normal;
}
.rc-userpay {
width: 100%;
height: 96px;
// display: flex;
// justify-content: space-between;
.paysucess{
display: flex;
align-items: center;
span{
.ready {
font-size: 20px;
display: block;
width: 61%;
color: #E2001A;
color: #e2001a;
}
.ready_right {
line-height: 200%;
padding-top: 8px;
}
.rc-all{
display: flex;
flex-direction: column;
justify-content: center;
.price {
font-size: 20px;
color: #e2001a;
}
.rc-payprice {
display: flex;
justify-content: flex-end;
span {
font-size: 16px;
color: #333333;
}
i {
font-size: 16px;
font-style: normal;
color: #e1001a;
}
}
.rc-receiving {
margin-top: 8px;
display: flex;
justify-content: flex-end;
span {
font-size: 16px;
color: #333333;
}
i {
font-style: normal;
color: #666666;
font-size: 16px;
}
}
strong {
font-size: 16px;
display: block;
margin-top: 53px;
color: #e1001a;
}
}
.paystype{
display: flex;
align-items: center;
}
.rc-paystype {
height: 100px;
display: flex;
align-items: center;
span {
.pay_title {
font-size: 26px;
color: #E2001A;
}
}
.payAlipay {
margin-left: 20px;
.user-righticon{
display: none;
img{
width: 8px;
height: 16px;
}
padding: 26px 0;
border-bottom: 1px solid #d7d7d7;
}
.pay_list {
padding: 20px 0;
.pay_item {
float: left;
margin-right: 20px;
display: flex;
justify-content: space-between;
height: 56px;
.rc-payype {
display: flex;
align-items: center;
font-size: 16px;
color: #E2001A;
justify-content: center;
width: 100%;
border: 1px solid #333333;
padding: 5px 20px;
cursor: pointer;
&.active {
border: 1px solid #e2001a;
color: #e2001a;
}
img {
width: 32px;
height: 32px;
border-radius: 50%;
}
span {
margin-left: 16px;
margin-right: 5px;
width: 24px;
height: 24px;
}
}
&::after {
content: "";
display: block;
clear: both;
}
}
.paycord {
width: 100%;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
img{
padding: 10px;
text-align: center;
.qrcode {
margin: 0 auto 10px;
width: 260px;
height: 260px;
display: block;
}
span{
font-size: 20px;
display: block;
color: #333333;
}
.dl_width {
width: 440px;
}
.dl_cont {
color: #333;
margin-top: -10px;
.title {
font-size: 26px;
font-weight: bold;
padding-bottom: 10px;
}
.line_dashed {
border-bottom: 2px dashed #999999;
margin: 10px 0;
}
.dl_img {
img {
width: 90px;
height: 90px;
margin: 0 auto;
}
padding: 0px 0 20px;
}
.userer {
img {
margin: 0 auto;
}
}
.tips {
color: #e2001a;
margin-top: 30px;
font-size: 18px;
}
}
@media screen and (max-width: 768px) {
.ph_hidden {
display: none;
}
.ready_right {
width: 100%;
padding: 10px;
}
.pay_title {
padding: 10px;
}
.pay_list {
padding: 0;
.pay_item {
float: none;
border: none;
border-bottom: 1px solid #d7d7d7;
height: 50px;;
margin-right: 0;
align-items: center;
justify-content: left;
justify-content: left; &.active {
border: none;
border-bottom: 1px solid #d7d7d7;
}
}
}
.paycord{ display:none;}
}
</style>

View File

@ -73,6 +73,64 @@
<div class="online"></div>
</div>
</div>
<div class="rc-carousel__gallery-thumbnails-wrapper">
<div class="rc-carousel rc-carousel__gallery-thumbnails">
<!-- Thunb images-->
<div
class="
rc-carousel__gallery-thumbnail
tns-item tns-slide-active
"
v-for="(item, index) in productAttachmentList"
:key="index"
>
<div class="rc-img--square">
<img :src="item.attachmentPath" alt="" />
</div>
</div>
<!-- Thunb images end-->
</div>
</div>
</div>
</div>
<div
class="ts-product-header rc-column"
id="328b2e5f-6904-4cac-9709-51ed18d2500f"
>
<div class="usermain" v-for="(item, index) in newlist" :key="index">
<div class="online bold rc-md-down"></div>
<div class="rc-main">
<div class="rc-title">
<h2>{{ item.productName }}</h2>
</div>
</div>
<div class="online rc-md-down"></div>
<div class="rc-main">
<div class="productdetails">
<div class="rc-productdetail">
<i class="ts-row-title">商品价格</i>
<span class="ts-realprice">{{ item.rsp }}</span>
<span class="ts-remove ts-ecprice"
>{{ item.ecPrice }}
</span>
</div>
<div class="rc-productdetai">
<div>
<i class="ts-row-title">活动促销</i>
<span>全场商品限时优惠</span>
</div>
<em class="ts-right-arr" @click="userget()">立即领取</em>
</div>
</div>
</div>
<div class="online bold rc-md-down"></div>
<div class="rc-main rc-md-up">
<div class="online"></div>
</div>
<div class="rc-productdeta" v-if="userbuy">
<div class="rc-main">
<div class="rc-prodtop">
@ -83,7 +141,7 @@
{{ item.title }}
</em> -->
<em class='active'>
<em class="active">
{{ item.specifications }}
</em>
</div>
@ -91,9 +149,17 @@
<div class="rc-main">
<div class="rc-produnnum">
<div><i class="ts-row-title">商品数量</i></div>
<img src="../../assets/image/userjian.png" alt="" @click="sub()" />
<img
src="../../assets/image/userjian.png"
alt=""
@click="sub()"
/>
<strong>{{ sales_num }}</strong>
<img src="../../assets/image/userjia.png" alt="" @click="plus()" />
<img
src="../../assets/image/userjia.png"
alt=""
@click="plus()"
/>
</div>
</div>
<div class="rc-main rc-md-up">
@ -101,60 +167,63 @@
</div>
<div class="online rc-md-down"></div>
<div class="rc-main">
<div class="rc-button" v-if="userbuy">
<span @click="usertanchu(item, 0)">加入购物车</span>
<span @click="usertanchu(item, 1)">立即购买</span>
</div>
<div class="certification">
<ul>
<li>
<span
><i class="ts-row-title">服务说明</i><i>当天14点前完成付款即日安排发货;当天14点后完成付款次日安排发货(周日及国家法定节假日顺延至下一个工作日发货,活动期间发货或有延迟敬请理解)</i></span
><i class="ts-row-title">服务说明</i
><i
>当天14点前完成付款即日安排发货;当天14点后完成付款次日安排发货(周日及国家法定节假日顺延至下一个工作日发货,活动期间发货或有延迟敬请理解)</i
></span
>
</li>
<li>
<span
><i class="ts-row-title">商品运费</i><i>全场包邮(港澳除外)</i></span
><i class="ts-row-title">商品运费</i
><i>全场包邮(港澳除外)</i></span
>
</li>
<li>
<span
><i class="ts-row-title">商品编号</i><i>{{ item.brandCode }}</i></span
><i class="ts-row-title">商品编号</i
><i>{{ item.brandCode }}</i></span
>
</li>
</ul>
</div>
<div class="rc-button" v-if="!userbuy">
<span @click="usertanchu(item,0)">加入购物车</span>
<span @click="usertanchu(item,1)">立即购买</span>
</div>
</div>
<div class="online bold rc-md-down"></div>
</div>
</div>
</div>
</div>
<div class="rc-footimage rc-main">
<img :src=item.showImgFile alt="">
<!-- <img :src="item.showImgFile" alt="" /> -->
</div>
<div class="rc-fixright">
<ul>
<li v-for="(userfixed,index) in fixedlist" :key="index" @click="lianxi(userfixed,index)">
<img :src="userfixed.catimage" alt="">
<li
v-for="(userfixed, index) in fixedlist"
:key="index"
@click="lianxi(userfixed, index)"
>
<img :src="userfixed.catimage" alt="" />
<span> {{ userfixed.title }}</span>
</li>
</ul>
<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>
<Myfooter v-on:litentop='showmesg'></Myfooter>
<Myfooter v-on:litentop="showmesg"></Myfooter>
</div>
<el-dialog
:visible.sync="dialogInfo1"
hegight="700px"
@close='userclose'
>
<el-dialog :visible.sync="dialogInfo1" @close="userclose">
<div class="rs-dis">
<div
class="rc-discount"
@ -164,52 +233,40 @@
<img :src="userimage" alt="" />
<div class="rc-contair">
<div class="rc-left">
<div>
<i></i><span>{{ item.couponAmount }}</span>
</div>
<div><i></i><span v-text="item.price"></span></div>
<p v-text="item.pricestype"></p>
</div>
<div class="rc-right">
<i>
{{ item.couponDesc }}
{{ item.special }}
</i>
<div class="rc-main" id="rc-main">
<div >
<span>有效期</span>
<em>{{ item.validTo }}</em>
<em>{{ item.starttime }}</em>
</div>
<div class="rc-footer">
<span @click="usergetconf(item)">立即领取</span>
</div>
</div>
</div>
</div>
</div>
</el-dialog>
<el-dialog
:visible.sync="dialogInfo2"
@close='userclose'
>
<el-dialog :visible.sync="dialogInfo2" @close="userclose">
<div class="rc-headera">
<div class="rc-title">
<img src="../../assets/error.png" alt="">
<img src="../../assets/error.png" alt="" />
</div>
<div class="rc-logmain">
<h3>温馨提示</h3>
<span>请先点击下方进行登录/注册</span>
</div>
<nuxt-link :to="`/userlogin/login/`">
<div class="userer">
<span>立即登录</span>
</div>
</nuxt-link>
</div>
</el-dialog>
<div class="rc-button rc-md-down">
<span @click="usertanchu(item, 0)">加入购物车</span>
@ -224,7 +281,13 @@ import tabs from "@/components/tabs.vue";
import unlogin from "~/components/unlogin.vue";
import { mapMutations } from "vuex";
import Myfooter from "~/components/rc-footer.vue";
import { goodsmessage,getConfig,postCourseId,getdraw,alldiscount } from "../../ajax/getData";
import {
goodsmessage,
getConfig,
postCourseId,
getdraw,
alldiscount,
} from "../../ajax/getData";
const settings = require("@/config");
export default {
// middleware: 'metaTitle',
@ -272,23 +335,53 @@ export default {
{
title: "购物车",
catimage: require("../../assets/buy.png"),
},
{
title: "在线客服",
catimage: require("../../assets/service.png"),
},
{
title: "营养专家",
catimage: require("../../assets/consult.png"),
},
],
productAttachmentList: [
{
id: 15901,
attachmentType: 1,
attachmentPath:
"https://miniapp-product.royalcanin.com.cn/rcmini/upload/1574384849415_BLUWOs.jpg",
sort: 1,
},
{
id: 15902,
attachmentType: 1,
attachmentPath:
"https://miniapp-product.royalcanin.com.cn/rcmini/upload/1574384851821_jFleXA.jpg",
sort: 2,
},
{
id: 15903,
attachmentType: 1,
attachmentPath:
"https://miniapp-product.royalcanin.com.cn/rcmini/upload/1574384853824_GrxAIp.jpg",
sort: 3,
},
{
id: 15904,
attachmentType: 1,
attachmentPath:
"https://miniapp-product.royalcanin.com.cn/rcmini/upload/1574384856077_9FbE1z.jpg",
sort: 4,
},
{
id: 15905,
attachmentType: 1,
attachmentPath:
"https://miniapp-product.royalcanin.com.cn/rcmini/upload/1574384859055_iPkFXi.jpg",
sort: 5,
},
],
newlist: [
{
price: "167.00",
@ -309,10 +402,8 @@ export default {
},
],
};
},
components: {
Myheader,
tabs,
@ -345,8 +436,32 @@ this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
}
}
tabs,
magnifier,
unlogin,
Myfooter,
},
mounted() {
// window.addEventListener("scroll", this.handleScroll, true);
if (this.usermessage !== "" || this.usermessage.data !== undefined) {
this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
let stype = this.$route.query.stype;
this.productCode = this.$route.query.productCode;
console.log(this.productCode);
this.userquery(this.productCode);
console.log(this.userlistmenu);
this.$nextTick(() => {});
if (stype == 1) {
this.userbuy = true;
} else if (stype == 2) {
console.log("这是要消失的");
this.$nextTick(() => {
this.userbuy = false;
});
}
}
},
methods: {
...mapMutations(["changemessage"]),
handleScroll(e)
@ -367,46 +482,62 @@ this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
},
lianxi(item, index) {
console.log(item, index);
if(item.title=='在线客服'){
if (item.title == "在线客服") {
var option = {
customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'}
}
customer: {
id: "",
name: "",
email: "",
mobile: "",
memberId: "999999",
},
};
dis_livchat(option);
}
if(item.title=='购物车'){
console.log('---12314');
if (item.title == "购物车") {
console.log("---12314");
this.$router.push({
path: "../../myorder/userrecord",
});
}
if(item.title=='营养专家'){
if (item.title == "营养专家") {
var option = {
customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'}
}
customer: {
id: "",
name: "",
email: "",
mobile: "",
memberId: "999999",
},
};
dis_livchat(option);
}
},
toTop() {
let top = document.documentElement.scrollTop || document.body.scrollTop;
//
const timeTop = setInterval(() => {
document.body.scrollTop = document.documentElement.scrollTop = top -= 400;
document.body.scrollTop =
document.documentElement.scrollTop =
top -=
400;
if (top <= 0) {
clearInterval(timeTop);
}
}, 10);
},
showmesg() {
console.log('-----');
console.log("-----");
this.toTop();
},
toTop() {
let top = document.documentElement.scrollTop || document.body.scrollTop;
//
const timeTop = setInterval(() => {
document.body.scrollTop = document.documentElement.scrollTop = top -= 400;
document.body.scrollTop =
document.documentElement.scrollTop =
top -=
400;
if (top <= 0) {
clearInterval(timeTop);
}
@ -416,7 +547,7 @@ this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
//
usergetconf(item) {
console.log(item);
if(this.usermessage.data!==''||this.usermessage.data!==undefined){
if (this.usermessage.data !== "" || this.usermessage.data !== undefined) {
this.getconf(this.usermessage.data.id, item.couponId);
}
},
@ -425,45 +556,37 @@ if(this.usermessage.data!==''||this.usermessage.data!==undefined){
async getconf(memberId, couponId) {
let data = await getConfig(memberId, couponId);
if (data) {
this.$message({
type: 'warning',
message: data.msg
type: "warning",
message: data.msg,
});
console.log(data);
}
},
// changeName(newName){
// this.name = newName;
// },
userclose() {
console.log('这是关闭的');
console.log("这是关闭的");
this.userlist = [];
},
async userquery() {
console.log("-----");
let data = await goodsmessage(this.productCode);
if (data) {
this.newlist = data.data;
}
this.productAttachmentList = this.newlist[0].productAttachmentList;
this.userlistmenu = this.newlist[0].productAttachmentList;
let changemess = JSON.stringify(this.userlistmenu);
console.log(changemess);
// console.log(changemess);
// this.productAttachmentList = this.userlistmenu;
this.changemessage({ data: changemess });
this.parent_msg = this.userlistmenu;
console.log( this.userlistmenu)
// console.log(this.userlistmenu);
},
//
@ -472,7 +595,6 @@ if(this.usermessage.data!==''||this.usermessage.data!==undefined){
if (data) {
this.drawlist = data.data;
}
},
//
@ -486,40 +608,33 @@ if(this.usermessage.data!==''||this.usermessage.data!==undefined){
let alllist = [];
this.userlist = this.alldraw.data;
this.userlist.forEach((element, index) => {
if(typeof element.productCodes=='string'){
if (typeof element.productCodes == "string") {
userlist.push(element);
// let s=element.productCodes.split(',');
// console.log(s.indexOf(this.productCode) != -1 )
// console.log('')
}
})
});
let menualist = [];
userlist.filter(item=>{
userlist.filter((item) => {
console.log(item);
item.productCodes=item.productCodes.split(',')
item.productCodes.forEach(element=>{
item.productCodes = item.productCodes.split(",");
item.productCodes.forEach((element) => {
if (element == this.productCode && item.activityId !== 10) {
console.log(element)
console.log(this.productCode)
console.log(element);
console.log(this.productCode);
menualist.push(item);
console.log('----');
console.log("----");
}
})
})
this.usernewlist=menualist;
console.log(this.usernewlist);
});
});
// this.usernewlist = menualist;
// console.log(this.usernewlist);
}
},
plus(num, index) {
this.sales_num = parseInt(this.sales_num) + 1;
console.log(this.sales_num);
},
@ -527,24 +642,9 @@ if(this.usermessage.data!==''||this.usermessage.data!==undefined){
sub(num, index) {
if (this.sales_num <= 1) {
this.sales_num = 1;
}
else{
} else {
this.sales_num = parseInt(this.sales_num) - 1;
}
},
async courseId(item) {
console.log(item);
console.log(this.usermessage);
// let userid=JSON.parse(location.getItem('userInfo'));
// let mobile=JSON.parse(location.getItem('userInfo'));
// console.log(userid,mobile);
let data = await postCourseId( this.productCode,this.sales_num,this.usermessage.data.id,this.usermessage.data.mobile,item.picFile,item.productName,item.basePrice,item.specifications);
if(data){
this.productlist=data;
}
console.log(data);
},
usertanchu(item,orderm){
@ -588,19 +688,44 @@ usertanchu(item,orderm){
}
},
usertanchu(item, orderm) {
let user = localStorage.getItem("userInfo");
if (user == undefined || user == null || user == "") {
this.dialogInfo2 = true;
return;
} else {
this.courseId(item);
if (orderm == 0) {
this.$message({
type: "warning",
message: "加入购物车成功",
});
}
if (orderm == 1) {
this.$router.push({
path: "/myorder/userrecord",
});
}
}
},
userget() {
let user = localStorage.getItem("userInfo");
if (user == undefined || user == null || user == "") {
this.dialogInfo2 = true;
return;
} else {
this.userdraw(this.usermessage.data.mobile);
this.alldrawlist(this.usermessage.data.id);
this.dialogInfo1 = true;
}
},
selectsearch(item, index) {
this.activeIndexa = index;
},
},
onceproduct(){
},
onceproduct() {},
};
</script>
<style lang="less" scoped>

View File

@ -1,6 +1,7 @@
package net.lab1024.smartadmin.module.system.royalcanin.good;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.internal.util.AlipaySignature;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -13,6 +14,7 @@ import net.lab1024.smartadmin.module.system.alipay.alipayModel.AliPayEntity;
import net.lab1024.smartadmin.module.system.alipay.conf.AlipayConfig;
import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst;
import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress;
import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity;
import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity;
import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService;
import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService;
@ -101,7 +103,7 @@ public class OrderController {
wxPayEntity.setProduct_id(ordersEntity.getProductCode());
wxPayEntity.setTotal_fee(StringUtil.toString(total_fee));
wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo());
return ResponseDTO.succData(wxpayService.generateQRCode(wxPayEntity));
return ResponseDTO.succData(ordersEntity.getOrderNo(),wxpayService.generateQRCode(wxPayEntity));
}
return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL);
}
@ -168,6 +170,31 @@ public class OrderController {
}
}
@ApiOperation(value = "重新支付", notes = "重新支付")
@PostMapping("royalcanin/repayOrderWX")
public ResponseDTO<String> repayOrderWX(String orderNo) throws Exception {
OrderEntity ordersEntity = orderService.findByOrderId(orderNo);
if(ordersEntity != null){
QueryEntity queryEntity = new QueryEntity();
queryEntity.setOrderNumber(ordersEntity.getOrderNo());
String orderInfo = orderService.query(queryEntity);
com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(orderInfo);
JSONObject jsonObject = (JSONObject)jsonArray.get(0);
if(jsonObject.getString("status").equals("0")) {
WxPayEntity wxPayEntity = new WxPayEntity();
wxPayEntity.setProduct_id(ordersEntity.getProductCode());
wxPayEntity.setTotal_fee(jsonObject.getString("salesAmount"));
wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo());
return ResponseDTO.succData(orderInfo, wxpayService.generateQRCode(wxPayEntity));
}else {
return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_ERROR,orderInfo);
}
}else {
return ResponseDTO.wrap(OrderResponseCodeConst.WITHOUT_ORDER);
}
}
@ApiOperation(value = "更新订单", notes = "更新订单")

View File

@ -20,6 +20,8 @@ public class OrderResponseCodeConst extends ResponseCodeConst {
public static final OrderResponseCodeConst WITHOUT_ORDER = new OrderResponseCodeConst(9007, "没有该订单数据!");
public static final OrderResponseCodeConst GENERATE_ORDER_ERROR = new OrderResponseCodeConst(9008, "该订单数据有误,请联系管理员!");
public OrderResponseCodeConst(int code, String msg) {
super(code, msg);
}

View File

@ -162,7 +162,24 @@ public class OrderService {
addOrSaveEntity.setDeliveryType(jsonObject.getString("deliveryType"));
addOrSaveEntity.setSalesAmount(jsonObject.getString("salesAmount"));
addOrSaveEntity.setOrderDate(jsonObject.getString("orderDate"));
addOrSaveEntity.setAddressCityName(jsonObject.getString("addressCityName"));
addOrSaveEntity.setAddressCountyName(jsonObject.getString("addressCountyName"));
addOrSaveEntity.setAddressDetailInfo(jsonObject.getString("addressDetailInfo"));
addOrSaveEntity.setAddressPhoneNumber(jsonObject.getString("addressPhoneNumber"));
addOrSaveEntity.setAddressProvinceName(jsonObject.getString("addressProvinceName"));
addOrSaveEntity.setAddressUserName(jsonObject.getString("addressUserName"));
addOrSaveEntity.setPaymentAmount(totalFee);
if (ordersEntity.getCouponCode() != ""&& null != ordersEntity.getCouponCode()) {
//coupon json化
OrderCouponEntity orderCouponEntity = new OrderCouponEntity();
orderCouponEntity.setCouponCode(ordersEntity.getCouponCode());
orderCouponEntity.setCouponName(ordersEntity.getCouponName());
orderCouponEntity.setCouponId(ordersEntity.getCouponId());
Map<String, String> orderCouponParamMap = MapRemoveNullUtil.setConditionMap(orderCouponEntity);
MapRemoveNullUtil.removeNullEntry(orderCouponParamMap);
net.sf.json.JSONObject orderCouponJson = net.sf.json.JSONObject.fromObject(orderCouponParamMap);
addOrSaveEntity.setOrderCoupon(orderCouponJson.toString());
}
addOrSave(addOrSaveEntity);
return ResponseDTO.succ();
}else{
@ -247,4 +264,9 @@ public class OrderService {
}
return endTotal;
}
public OrderEntity findByOrderId(String orderNo){
return ordersDao.findByOrderId(orderNo);
}
}