!85 2022-1-22 Jiamin

Merge pull request !85 from Admin/sit-jiamin-v2
This commit is contained in:
Admin 2022-01-23 05:07:59 +00:00 committed by Gitee
commit 92b2aa9346
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 82 additions and 121 deletions

View File

@ -22,8 +22,9 @@
.rc-button{
display: flex;
align-items: center;
justify-content: center;
width: 375px;
justify-content: flex-end;
width: 100%;
height: 80px;
background: #FFFFFF;
box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
@ -38,6 +39,7 @@ opacity: 1;
border-radius: 30px;
background: #E2001A;
display: flex;
margin-right: 20px;
justify-content: center;
align-items: center;
font-size: 16px;

View File

@ -1,12 +1,11 @@
<template>
<div class="crumbs" v-if="showTab">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to=item.path v-for="(item, index) in titleLists"
:key="index">{{ item.meta.title }}</el-breadcrumb-item>
<!-- <el-breadcrumb-item>商品管理</el-breadcrumb-item>
<el-breadcrumb-item>商品分类</el-breadcrumb-item> -->
</el-breadcrumb>
<el-breadcrumb-item to="/" >{{ this.homepageName }}</el-breadcrumb-item>
<el-breadcrumb-item :to=item.path v-for="(item, index) in crumbs"
:key="index">{{ item.title }}</el-breadcrumb-item>
</el-breadcrumb>
</div>
</template>
@ -14,93 +13,25 @@
import { mapState, mapMutations } from "vuex";
export default {
props:["crumbs"],
name:"crumbs",
data() {
return {
title: "",
path: "",
titleLists: [
{
path: '/',
name: 'index',
meta:{
title: '首页',
}
}
],
showTab: true,
isShow: true,
homepageName:'首页'
};
},
watch: {
$route() {
this.setTitle();
created(){
if(this.showTab != false)
this.showTab=true;
},
watch: {
},
mounted() {
this.setTitle();
},
methods: {
...mapMutations(["changemessage",'selectMenu']),
setTitle() {
console.log(this.$route.matched);
console.log(this.titleLists);
let userinfo=[]
let saveUserInfo={
path:'admin',
name:'1',
meta:'b341181c-aced-11e9-89bf-00163e0e8daf',
...mapMutations(["changemessage",'selectMenu'])
}
userinfo.push(this.$route.matched);
let list=[];
console.log(userinfo);
userinfo.map(item=>{
console.log(item);
list=item;
})
console.log(list);
let anlist={
path:'admin',
name:'1',
meta:'b341181c-aced-11e9-89bf-00163e0e8daf',
}
list.forEach(element=>{
console.log(element);
anlist=element
})
for(let i in list){
saveUserInfo.path=list[i].path;
saveUserInfo.name=list[i].name;
saveUserInfo.meta=list[i].meta;
}
console.log(saveUserInfo);
// store.commit('se', current.name);
this.selectMenu({ data: saveUserInfo });
console.log(this.$store.state.tabsList);
this.titleLists=this.$store.state.tabsList;
// console.log(userlisa);
console.log(this.titleLists);
},
},
// created(){
// let user=this.$store.state.tabsList;
// this.tags=user;
// console.log(this.tags);
// console.log(user);
// console.log(this.$store.state.tabsList)
// },
// mounted(){
// }
};
</script>

View File

@ -146,6 +146,7 @@
<script>
import Myheader from "~/components/header.vue";
import { mapMutations } from "vuex";
import { userin} from "../../ajax/getData";
import MyFooter from '~/components/rc-footer.vue'
import {selectaddress,canceldanhao,generateOrderWX} from "../../ajax/getData";
@ -168,6 +169,7 @@ export default {
usersalesAmount:'',
leftico: require("../../assets/image/rc-left.png"),
orderNumber:'',
userdata:"",
usermessage:null,
userid: null,
useralllist:[],
@ -196,7 +198,11 @@ export default {
};
},
methods: {
...mapMutations(["checkIsLogin"]),
refreshDesktopNav:function(){
RCDL.navigation.currentState=null;
RCDL.navigation.rebuild();
},
//
async canceldanhao(orderNumber) {
let data = await canceldanhao(this.userphone,this.orderNumber);
@ -221,6 +227,12 @@ userpay(){
if(this.goldastates==0){
this.canceldanhao();
}
else if( this.customer='联系客服申请售后'){
var option = {
customer: {id: '', name: '', email: '', mobile: '', memberId: this.userdata.data.id}
}
dis_livchat(option);
}
},
//
onceagain(){
@ -317,6 +329,9 @@ if(data){
},
mounted() {
this.checkIsLogin();
this.userdata=this.$store.state.userInfo;
console.log(this.userdata);
this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
this.userid = this.usermessage.data.id;
this.userphone=this.usermessage.data.mobile;

View File

@ -54,7 +54,7 @@
</div>
<div class="rc-userbottom">
<span>数量:{{ item.pcs }}</span>
<i>{{ }}</i>
<i>10</i>
</div>
<div class="rc-userbottomm">
<i>{{ item.userprice }}</i>
@ -289,6 +289,9 @@ export default {
this.goldmedal = data;
this.alllist=[];
this.useralllist=[];
this.obligation=[];
this.receiving=[];
this.pending=[];
for (let i = 0; i < this.goldmedal.length; i++) {
this.useralllist.push(this.goldmedal[i].orderDetailList[0]);
this.alllist.push(this.goldmedal[i].orderDetailList[0])
@ -299,10 +302,11 @@ export default {
}else if(this.goldmedal[i].status==1){
this.receiving.push(this.goldmedal[i].orderDetailList[0]);
}
else if(this.goldmedal[i].status==4){
else if(this.useralllist[i].status==2){
this.pending.push(this.goldmedal[i].orderDetailList[0]);
}
}
for (var i = 0; i < this.useralllist.length; i++) {
this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber;
this.useralllist[i].status = this.goldmedal[i].status;
@ -346,7 +350,7 @@ export default {
// addressDetailInfo: orderAddress[0].detailAddress,
// },
// };
postData.push(oneProduct);
// postData.push(oneProduct);
let res = await generateOrderWX(postData);
let userPayData = {
orderId: res.data,
@ -383,7 +387,7 @@ export default {
message: "取消订单成功",
});
setTimeout(() => {
this.indet();
this.indet(this.userdata);
this.activeIndex=0;
this.useralllist=[];
}, 500);

View File

@ -2,6 +2,7 @@
<div>
<Myheader></Myheader>
<div class="rc-top"></div>
<tabs :crumbs="crumbs"></tabs>
<div class="rc-max-width--xl rc-main">
<div class="usersearch">
<div class="usercontentshow" ref="usercontent">
@ -310,6 +311,7 @@
import Myheader from "~/components/header.vue";
import MyFooter from '~/components/rc-footer.vue'
import FixRight from "~/components/fixed-right.vue";
import tabs from "~/components/tabs.vue";
import {
userstype,
biaome,
@ -320,6 +322,12 @@ import {
export default {
data() {
return {
crumbs:[
{
path:'/productdetails/productlist/',
title:'产品列表',
}
],
value: "",
isLoading: false,
userstype: [],
@ -477,7 +485,8 @@ export default {
components: {
Myheader,
MyFooter,
FixRight
FixRight,
tabs
},
created() {
this.routeParams=this.$route.query;

View File

@ -104,23 +104,23 @@ export default {
register(){
console.log(this.tel)
if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === "") {
if ( this.alladdress==='') {
this.$message({
type: 'warning',
message: '请输入详细地址 '
});
return
}if(!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === ""){
this.$message({
type: 'warning',
message: '手机号码输入有误'
});
return
}else if(this.alladdress===''){
this.$message({
type: 'warning',
message: '请输入详细地址'
});
return
}
else if(this.userpeople===''){
this.$message({
type: 'warning',
message: '请输入姓名'
message: '请填写收货人'
});
return
}

View File

@ -158,7 +158,7 @@ export default {
if(data){
this.$message({
type: 'warning',
message: '删除成功'
message: '地址删除成功'
});
}
this.editaddress();