zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product

pull/2/head
tangqian 2023-05-22 18:06:01 +08:00
parent 2d223030d4 87fc147c02
commit d84b6869f5
24 changed files with 113 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-ui-admin/src/views/system/tenant/index.vue
View File

@ -346,7 +346,7 @@ export default {
},
handleQRCode(row) {
const baseUrl = 'http://yuxy.perrymake.com'
const url =`${baseUrl}/pages/index/index?redirectUrl=${baseUrl}&tenantId=${row.id}`
const url =`${baseUrl}/pages/member_application/index?redirectUrl=${baseUrl}&tenantId=${row.id}`
QRCode.toCanvas(document.getElementById(`id-${row.id}`), url, {
scale: 2
}, function (error) {

4
yudao-ui-app/components/paymentMember/index.vue
View File

@ -198,12 +198,12 @@
<style scoped lang="scss">
.payment {
position: fixed;
bottom: 4%;
bottom: 0;
left: 0;
width: 100%;
border-radius: 16rpx 16rpx 0 0;
background-color: #fff;
padding-bottom: 100rpx;
padding-bottom: 4%;
z-index: 99;
transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
transform: translate3d(0, 100%, 0);

4
yudao-ui-app/config/app.js
View File

@ -1,12 +1,12 @@
let domain = 'http://192.168.1.147:48080'
let domain = 'http://yuxy.perrymake.com'
module.exports = {
// 请求域名 格式： https://您的域名
// #ifdef MP
HTTP_REQUEST_URL: domain,
// #endif
HTTP_ADMIN_URL:'http://192.168.1.147:48080', //PC后台的API请求地址，上传图片用
HTTP_ADMIN_URL:'http://yuxy.perrymake.com', //PC后台的API请求地址，上传图片用
// #ifdef H5
//H5接口是浏览器地址
// HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host,

2
yudao-ui-app/manifest.json
View File

@ -1,6 +1,6 @@
{
"name" : "创盈云",
"appid" : "__UNI__C8AF139",
"appid" : "__UNI__B5A2217",
"description" : "创盈商城",
"versionName" : "1.0.0",
"versionCode" : 1001,

37
yudao-ui-app/pages.json
View File

@ -567,30 +567,31 @@
"selectedColor": "#fc4141",
"borderStyle": "white",
"backgroundColor": "#ffffff",
"list": [{
"pagePath": "pages/index/index",
"iconPath": "static/images/tabbar/nav_icon_shop.png",
"selectedIconPath": "static/images/1-002.png",
"text": "商城"
},
{
"pagePath": "pages/goods_cate/goods_cate",
"iconPath": "static/images/tabbar/nav_icon_sort.png",
"selectedIconPath": "static/images/2-002.png",
"text": "分类"
},
"list": [
// {
// "pagePath": "pages/index/index",
// "iconPath": "static/images/tabbar/nav_icon_shop.png",
// "selectedIconPath": "static/images/1-002.png",
// "text": "商城"
// },
// {
// "pagePath": "pages/goods_cate/goods_cate",
// "iconPath": "static/images/tabbar/nav_icon_sort.png",
// "selectedIconPath": "static/images/2-002.png",
// "text": "分类"
// },
{
"pagePath": "pages/member_application/index",
"iconPath": "static/images/2-001.png",
"selectedIconPath": "static/images/tabbar/nav_icon_member_active.png",
"text": "会员申请"
},
{
"pagePath": "pages/order_addcart/order_addcart",
"iconPath": "static/images/tabbar/nav_icon_cart.png",
"selectedIconPath": "static/images/3-002.png",
"text": "购物车"
},
// {
// "pagePath": "pages/order_addcart/order_addcart",
// "iconPath": "static/images/tabbar/nav_icon_cart.png",
// "selectedIconPath": "static/images/3-002.png",
// "text": "购物车"
// },
{
"pagePath": "pages/user/index",
"iconPath": "static/images/tabbar/nav_icon_my.png",

35
yudao-ui-app/pages/member_application/index.vue
View File

@ -101,17 +101,26 @@
},
async onLoad() {
const res = await memberGradeInfo()
if(res.data.some((item) => !!parseInt(item.isExist))){
uni.setTabBarItem({
index: 2,
pagePath: '/pages/member_equity/index'
})
uni.switchTab({
url:'/pages/member_equity/index'
})
uni.showLoading({
title: '加载中',
mask: true
});
try{
const res = await memberGradeInfo()
if(res.data.some((item) => !!!parseInt(item.isExist))){
console.log(123123)
uni.setTabBarItem({
index: 0,
pagePath: '/pages/member_equity/index'
})
uni.switchTab({
url:'/pages/member_equity/index'
})
}
this.memberData = res.data
} finally{
uni.hideLoading();
}
this.memberData = res.data
},
methods: {
@ -217,14 +226,14 @@
background-size: cover;
background-repeat: no-repeat;
background-attachment: fixed;
.u-nav-slot{
::v-deep .u-popup__content{
padding-bottom: 20% !important;
}
}
.phone-money {
width: 604rpx;

22
yudao-ui-app/pages/member_equity/index.vue
View File

@ -11,8 +11,8 @@
</view>
<view class="member-right">
<image src='../../static/images/vipStar.png'></image>
<text>会员等级3级</text>
<button>立即续费</button>
<text>会员等级{{vipData.findIndex((item) => item == memberDetail.grade) +1}}级</text>
<button @click="handleRenew">立即续费</button>
</view>
</view>
<view class="box-equity">
@ -20,7 +20,7 @@
<text class="equity-member">我的会员权益</text>
<text class="equity-look">查看权益></text>
</view>
<view class="equity-item" v-for="(item,index) in 2" :key="index">
<view class="equity-item" v-for="(item,index) in 3" :key="index">
<view class="equity-grade">
<image src='../../static/images/member240.png'></image>
<text>办理日期：2021.12.30</text>
@ -79,6 +79,7 @@
fontSize:'28'
},
],
vipData:['普通会员','中级会员','高级会员'],
show: false,
memberDetail:{}
};
@ -89,6 +90,11 @@
this.memberDetail = res.data
},
methods: {
handleRenew(){
uni.navigateTo({
url:'/pages/member_renew/index'
})
},
handleSelect(value){
switch (value.name){
case "购买记录":
@ -97,7 +103,6 @@
})
break;
case "为他人充值":
console.log(123)
uni.navigateTo({
url:'/pages/member_others/index'
})
@ -106,20 +111,13 @@
break;
}
},
submit() {
this.$refs.uForm.validate().then(res => {
uni.$u.toast('校验通过')
}).catch(errors => {
uni.$u.toast('校验失败')
})
}
}
};
</script>
<style lang="scss" scoped>
.box {
margin-bottom: 30%;
margin-top: 10%;
background: #fff;
height: 100vh;

18
yudao-ui-app/pages/member_others/index.vue
View File

@ -114,8 +114,16 @@
};
},
async onLoad() {
const res = await memberGradeInfo()
this.memberData = res.data
uni.showLoading({
title: '加载中',
mask: true
});
try{
const res = await memberGradeInfo()
this.memberData = res.data
} finally{
uni.hideLoading();
}
},
methods: {
handleMember(value, index) {
@ -151,7 +159,7 @@
})
}
}).catch(errors => {
uni.$u.toast('校验失败')
uni.$u.toast('请检查手机号输入')
})
},
/**
@ -222,6 +230,10 @@
background: #fff;
}
}
::v-deep .u-form-item__body__right__message{
margin-top: 10rpx;
color: #fff;
}
.phone-money {
width: 604rpx;

9
yudao-ui-app/pages/member_renew/index.vue
View File

@ -95,9 +95,16 @@ import store from '@/store/index';
};
},
async onLoad() {
uni.showLoading({
title: '加载中',
mask: true
});
try{
const res = await memberGradeInfo()
this.memberData = res.data
this.form.userPhone = store.state.app.userInfo.mobile
this.form.userPhone = store.state.app.userInfo.mobile } finally{
uni.hideLoading();
}
},
methods: {
handleMember(value,index){

18
yudao-ui-app/pages/user/index.vue
View File

@ -89,17 +89,17 @@
<!-- <view class="menu-title">我的服务</view> -->
<u-cell-group>
<u-cell title="收货地址" isLink @click="jumpPage('/pages/users/user_address_list/index')">
<u-icon slot="icon" size="32" name="map"></u-icon>
<u-icon slot="icon" size="45" name="/static/images/user_icon1.png"></u-icon>
</u-cell>
<u-cell title="分销中心" v-if="userInfo.userType === 'PROMOTER'" isLink
@click="jumpPage('/pages/users/user_spread_user/index')">
<u-icon slot="icon" size="32" name="map"></u-icon>
<u-icon slot="icon" size="45" name="/static/images/user_icon2.png"></u-icon>
</u-cell>
<u-cell title="热线电话" value="023-12948338" :value="tenantInfo.serviceMobile" isLink>
<u-icon slot="icon" size="32" name="phone"></u-icon>
<u-icon slot="icon" size="45" name="/static/images/user_icon3.png"></u-icon>
</u-cell>
<u-cell title="在线客服" value="8:30-17:30" :value="tenantInfo.serviceTime" isLink @click="kefuClick">
<u-icon slot="icon" size="32" name="kefu-ermai"></u-icon>
<u-icon slot="icon" size="45" name="/static/images/user_icon4.png"></u-icon>
</u-cell>
</u-cell-group>
</view>
@ -151,31 +151,31 @@
data() {
return {
orderMenu: [{
img: '/static/images/order1.png',
img: '/static/images/order_icon1.png',
title: '待付款',
url: '/pages/users/order_list/index?status=0',
num: 0
},
{
img: '/static/images/order2.png',
img: '/static/images/order_icon2.png',
title: '待发货',
url: '/pages/users/order_list/index?status=1',
num: 0
},
{
img: '/static/images/order3.png',
img: '/static/images/order_icon3.png',
title: '待收货',
url: '/pages/users/order_list/index?status=2',
num: 0
},
{
img: '/static/images/order4.png',
img: '/static/images/order_icon4.png',
title: '已完成',
url: '/pages/users/order_list/index?status=3',
num: 0
},
{
img: '/static/images/order5.png',
img: '/static/images/order_icon5.png',
title: '售后/退款',
url: '/pages/users/user_return_list/index',
num: 0

11
yudao-ui-app/pages/users/login/index.vue
View File

@ -269,10 +269,11 @@
getUserInfo().then(res => {
this.$store.commit("UPDATE_USERINFO", res.data);
// let backUrl = this.$Cache.get(BACK_URL) || "/pages/index/index";
let backUrl = "/pages/index/index";
if (backUrl.indexOf('/pages/users/login/index') !== -1) {
backUrl = '/pages/index/index';
}
let backUrl = "/pages/member_application/index";
// let backUrl = "/pages/index/index";
// if (backUrl.indexOf('/pages/users/login/index') !== -1) {
// backUrl = '/pages/index/index';
// }
uni.reLaunch({
url: backUrl
});
@ -477,7 +478,7 @@
justify-content: center;
width: 100%;
height: 87rpx;
margin-top: 137rpx;
margin-top: 237rpx;
color: #FFFFFF;
font-size: 32rpx;
background: linear-gradient(0deg, #E63163 0%, #FF819F 100%);

8
yudao-ui-app/pages/users/register/index.vue
View File

@ -1,7 +1,8 @@
<template>
<div class="login-wrapper">
<div class="logo-wrap">
<img src="/static/images/logo.png" style="width:127rpx;height:45rpx;"></image>
<img src="/static/images/mallLogo.png" style="width:105rpx;height:105rpx;"></image>
<img src="/static/images/mall.png" style="width:233rpx;height:43rpx;"></image>
</div>
<view class="title">注册账号</view>
<div class="whiteBg">
@ -206,6 +207,11 @@
.logo-wrap {
margin: 285rpx 0 85rpx 0;
display:flex;
align-items:center;
img{
margin-right: 20rpx;
}
}
.title {

10
yudao-ui-app/pages/users/retrievePassword/index.vue
View File

@ -1,7 +1,8 @@
<template>
<div class="login-wrapper">
<div class="logo-wrap">
<img src="/static/images/logo.png" style="width:127rpx;height:45rpx;"></image>
<img src="/static/images/mallLogo.png" style="width:105rpx;height:105rpx;"></image>
<img src="/static/images/mall.png" style="width:233rpx;height:43rpx;"></image>
</div>
<view class="title">找回密码</view>
<div class="whiteBg">
@ -154,6 +155,11 @@
.logo-wrap {
margin: 285rpx 0 85rpx 0;
display:flex;
align-items:center;
img{
margin-right: 20rpx;
}
}
.title {
@ -227,7 +233,7 @@
justify-content: center;
width: 100%;
height: 87rpx;
margin-top: 80rpx;
margin-top: 99rpx;
color: #FFFFFF;
font-size: 32rpx;
background: linear-gradient(0deg, #E63163 0%, #FF819F 100%);

2
yudao-ui-app/pages/users/user_info/index.vue
View File

@ -140,7 +140,7 @@
.then(res => {
that.$store.commit("LOGOUT");
uni.reLaunch({
url: '/pages/index/index'
url: '/pages/users/login/index'
});
})
.catch(err => {

4
yudao-ui-app/pages/users/user_spread_code/index.vue
View File

@ -205,7 +205,7 @@
// href = window.location.href.split('/pages')[0];
console.log('uid', that.uid)
const baseUrl = 'http://yuxy.perrymake.com';
const url =`${baseUrl}/pages/index/index?redirectUrl=${baseUrl}&tenantId=${that.tenantId}&spreadId=${that.uid}`
const url =`${baseUrl}/pages/member_application/index?redirectUrl=${baseUrl}&tenantId=${that.tenantId}&spreadId=${that.uid}`
console.log('url', url)
uQRCode.make({
canvasId: 'qrcode',
@ -239,7 +239,7 @@
success: function(res) {
context.drawImage(arrImages, 0, 0, 750, 1190);
context.save();
context.drawImage(code, 110, 925, 140, 140);
context.drawImage(code, 110, 700, 300, 300);
context.restore();
context.setFontSize(28);
context.fillText(nickname, 270, 980);

BIN
yudao-ui-app/static/images/order_icon1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
yudao-ui-app/static/images/order_icon2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
yudao-ui-app/static/images/order_icon3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
yudao-ui-app/static/images/order_icon4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
yudao-ui-app/static/images/order_icon5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
yudao-ui-app/static/images/user_icon1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
yudao-ui-app/static/images/user_icon2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
yudao-ui-app/static/images/user_icon3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
yudao-ui-app/static/images/user_icon4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB