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

This commit is contained in:
Admin
2022-01-19 12:17:29 +00:00
committed by Gitee
39 changed files with 539 additions and 572 deletions

View File

@@ -1,12 +1,11 @@
<template>
<div class="settlement">
<Myheader></Myheader>
<div class="rc-main">
<tabs></tabs>
<div class="address-list">
<tabs></tabs>
<div class="online"></div>
<div class="rc-main" v-for="(item,index) in goldmedal" :key="index" >
<div class="rc-border"></div>
<div
class="mypersonal"
v-for="(item, index) in useraddress"
@@ -107,13 +106,11 @@
<script>
import Myheader from "~/components/header.vue";
import { userin, memberAddress, generateOrderWX } from "../../ajax/getData";
import tabs from "@/components/tabs.vue";
import myAddress from "../address/address.vue";
import itemMixin from "../../../smart-admin-web/src/components/main/components/side-menu/item-mixin";
import {userin} from "../../ajax/getData";
import tabs from "@/components/tabs.vue";
export default {
middleware: "metaTitle",
meta: { title: "订单结算" },
middleware: 'metaTitle',
meta: {title: '订单结算'},
data() {
return {
goldmedal: [],
@@ -129,18 +126,39 @@ export default {
curAddress: {},
saveType: "",
useraddress: [
// {
// state: "李某某",
// tel: "15124117917",
// address: "广东省 广州市 天河区 天河客运站118号",
// isdefault: true,
// },
// {
// state: "李某某",
// tel: "15124117917",
// address: "广东省 广州市 天河区 天河客运站118号",
// isdefault: false,
// },
{
state: "李某某",
tel: "15124117917",
address: "广东省 广州市 天河区 天河客运站118号",
},
{
state: "李某某",
tel: "15124117917",
address: "广东省 广州市 天河区 天河客运站118号",
},
{
state: "李某某",
tel: "15124117917",
address: "广东省 广州市 天河区 天河客运站118号",
},
{
state: "李某某",
tel: "15124117917",
address: "广东省 广州市 天河区 天河客运站118号",
},
],
goldmedal: [
{
ordernumber: "1111111111111111111",
orderstype: 1,
index:0,
usereat: "英国短毛猫成猫全价湿粮",
num: "5kg",
specification: "1",
userprice: "167.00",
catimage: require("../../assets/image/rc-win.png"),
},
],
shopprice: {
price: "标准快递",
@@ -311,16 +329,12 @@ export default {
},
components: {
Myheader,
tabs,
myAddress,
tabs
},
};
</script>
<style lang="less" scoped>
@import "./settlement.less";
@import url("../../assets/css/global.less");
// @import url("../../assets/css/settlement.less");
@import url("../../assets/css/settlement.less");
</style>