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

Merge pull request 'feature/mall_product' (#3) from feature/mall_product into master 

Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/3
pull/4/head
tianyu 2023-05-30 10:21:40 +08:00
parent 2181149f74 ff84ef642c
commit 269323dca5
6 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-ui-admin/src/views/mall/market/banner/index.vue
View File

@ -58,7 +58,7 @@
<el-input v-model="form.title" placeholder="请输入标题"/> <el-input v-model="form.title" placeholder="请输入标题"/>
</el-form-item> </el-form-item>
<el-form-item label="缩略图" prop="picUrl"> <el-form-item label="缩略图" prop="picUrl">
<imageUpload v-model="form.picUrl" :limit="1" :format="'163*163'"/> <imageUpload v-model="form.picUrl" :limit="1" :format="'664*238'" />
</el-form-item> </el-form-item>
<el-form-item label="跳转链接" prop="url"> <el-form-item label="跳转链接" prop="url">
<el-input v-model="form.url" placeholder="请输入跳转链接"/> <el-input v-model="form.url" placeholder="请输入跳转链接"/>
@ -213,7 +213,10 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
// :deep(.el-upload-list__item){
width: 332px;
height: 119px;
}
.img-height { .img-height {
height: 150px; height: 150px;
} }

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

@ -119,7 +119,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="微信客户地址" prop="wxKfUrl"> <el-form-item label="微信客服地址" prop="wxKfUrl">
<el-input v-model="form.wxKfUrl" placeholder="请输入"/> <el-input v-model="form.wxKfUrl" placeholder="请输入"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -131,7 +131,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="销售对接号码" prop="saleContactMobile"> <el-form-item label="销售对接人号码" prop="saleContactMobile">
<el-input v-model="form.saleContactMobile" placeholder="请输入"/> <el-input v-model="form.saleContactMobile" placeholder="请输入"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -156,7 +156,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="店铺状态" prop="status"> <el-form-item label="启用状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="parseInt(dict.value)">{{ dict.label }} :key="dict.value" :label="parseInt(dict.value)">{{ dict.label }}
@ -459,6 +459,10 @@ export default {
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
:deep(.el-upload-list__item){
width: 82px;
height: 82px;
}
.qrcode-wrap { .qrcode-wrap {
text-align: center; text-align: center;
} }

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

@ -48,7 +48,7 @@
{ {
"path": "pages/member_others/index", "path": "pages/member_others/index",
"style": { "style": {
"navigationBarTitleText": "代他人续费" "navigationBarTitleText": "代他人充值"
} }
}, },
{ {

25
yudao-ui-app/pages/member_back/index.vue
View File

@ -17,7 +17,7 @@
<image src='../../static/images/memberLogo.png'></image> <image src='../../static/images/memberLogo.png'></image>
<text class="equity-member">我的会员权益</text> <text class="equity-member">我的会员权益</text>
</view> </view>
<text class="equity-look">查看权益></text> <!-- <text class="equity-look">查看权益></text> -->
</view> </view>
<view class="equity-item" v-for="(item,index) in equityData" :key="index"> <view class="equity-item" v-for="(item,index) in equityData" :key="index">
<view class="equity-grade"> <view class="equity-grade">
@ -38,7 +38,7 @@
</view> </view>
<view class="money-box money-term"> <view class="money-box money-term">
<text>带返还期额</text> <text>带返还期额</text>
<text class="money-text">{{item.frequency}}x12</text> <text class="money-text">{{list[list.findIndex((i) => item.gear == i.name)].frequency}}x12</text>
</view> </view>
<view class="money-box money-time"> <view class="money-box money-time">
<text>返费结束时间</text> <text>返费结束时间</text>
@ -67,16 +67,19 @@
list: [ list: [
{ {
img:'../../static/images/member240.png', img:'../../static/images/member240.png',
name:360 name:"360",
frequency:30
}, },
{ {
img:'../../static/images/member400.png', img:'../../static/images/member400.png',
name:600 name:"600",
}, frequency:50
{ },
img:'../../static/images/member960.png', {
name:900 img:'../../static/images/member640.png',
}, name:"960",
frequency:80
},
], ],
vipData:['普通会员','中级会员','高级会员'], vipData:['普通会员','中级会员','高级会员'],
show: false, show: false,

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

@ -1,7 +1,7 @@
<template> <template>
<view class="box"> <view class="box">
<view class="box-phone"> <view class="box-phone">
<u--form :model="form" :rules="rules" ref="uForm" labelWidth="100"> <u--form :model="form" :rules="rules" ref="uForm" labelWidth="100" errorType="toast">
<u-form-item label="姓名" prop="userName"> <u-form-item label="姓名" prop="userName">
<u--input v-model="form.userName" maxlength="11" placeholder="请输入您的姓名"></u--input> <u--input v-model="form.userName" maxlength="11" placeholder="请输入您的姓名"></u--input>
</u-form-item> </u-form-item>
@ -88,13 +88,13 @@
required: true, required: true,
message: '姓名不能为空', message: '姓名不能为空',
// 触发器可以同时用blur和change // 触发器可以同时用blur和change
trigger: ['change', 'blur'] trigger: ['blur']
}], }],
userPhone: [{ userPhone: [{
required: true, required: true,
message: '手机号不能为空', message: '手机号不能为空',
// 触发器可以同时用blur和change // 触发器可以同时用blur和change
trigger: ['change', 'blur'] trigger: ['blur']
}, },
{ {
pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[1-25-9])\d{8}$/g, pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[1-25-9])\d{8}$/g,
@ -103,14 +103,14 @@
return String(value); return String(value);
}, },
message: '手机号不正确（190.193号段不可充值）', message: '手机号不正确（190.193号段不可充值）',
trigger: ['change', 'blur'] trigger: ['blur']
}, },
], ],
confirmPhone: [{ confirmPhone: [{
required: true, required: true,
message: '手机号确认不能为空', message: '手机号确认不能为空',
// 触发器可以同时用blur和change // 触发器可以同时用blur和change
trigger: ['change', 'blur'] trigger: ['blur']
}, },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
@ -118,7 +118,7 @@
return this.form.userPhone == this.form.confirmPhone return this.form.userPhone == this.form.confirmPhone
}, },
message: '手机号不一致', message: '手机号不一致',
trigger: ['change', 'blur'], trigger: ['blur'],
} }
] ]
} }
@ -137,27 +137,19 @@
} }
}, },
watch:{ watch:{
'form.userPhone' (){ 'form.userPhone' (val){
this.verify() this.verify(val)
}, },
'form.confirmPhone' (){ 'form.confirmPhone' (val){
this.verify() this.verify(val)
} }
}, },
methods: { methods: {
verify(){ async verify(phone){
this.$refs.uForm.validate().then(async res => { if(this.form.userPhone == this.form.confirmPhone){
uni.showLoading({ const res = await memberByHomeGradeInfo(phone)
title: '加载中', this.memberData = res.data
mask: true }
});
try{
const res = await memberByHomeGradeInfo(this.form.confirmPhone)
this.memberData = res.data
} finally{
uni.hideLoading();
}
})
}, },
handleMember(value, index) { handleMember(value, index) {
if (!!parseInt(value.isExist)) return if (!!parseInt(value.isExist)) return
@ -267,6 +259,7 @@
::v-deep .u-form-item__body__right__message{ ::v-deep .u-form-item__body__right__message{
margin-top: 10rpx; margin-top: 10rpx;
color: #fff; color: #fff;
font-size: 26rpx;
} }
.phone-money { .phone-money {

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

@ -1,8 +1,8 @@
<template> <template>
<view class="box"> <view class="box">
<view class="box-phone"> <view class="box-phone">
<u--form :model="form" :rules="rules" ref="uForm" labelWidth="100"> <u--form :model="form" :rules="rules" ref="uForm" labelWidth="100" errorType="toast">
<u-form-item label="姓名" prop="userName" > <u-form-item label="姓名" prop="userName">
<u--input v-model="form.userName" maxlength="11" placeholder="请输入您的姓名"></u--input> <u--input v-model="form.userName" maxlength="11" placeholder="请输入您的姓名"></u--input>
</u-form-item> </u-form-item>
<u-form-item label="手机号" prop="phone" > <u-form-item label="手机号" prop="phone" >
@ -82,14 +82,14 @@ import store from '@/store/index';
required: true, required: true,
message: '姓名不能为空', message: '姓名不能为空',
// 触发器可以同时用blur和change // 触发器可以同时用blur和change
trigger: ['change', 'blur'] trigger: ['blur']
}], }],
userPhone: [ userPhone: [
{ {
required: true, required: true,
message: '手机号不能为空', message: '手机号不能为空',
// 触发器可以同时用blur和change // 触发器可以同时用blur和change
trigger: ['change', 'blur'] trigger: [ 'blur']
}, },
{ {
pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[1-25-9])\d{8}$/g, pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[1-25-9])\d{8}$/g,
@ -98,7 +98,7 @@ import store from '@/store/index';
return String(value); return String(value);
}, },
message: '手机号不正确（190.193号段不可充值）', message: '手机号不正确（190.193号段不可充值）',
trigger: ['change', 'blur'] trigger: ['blur']
}, },
] ]
} }
@ -224,6 +224,7 @@ import store from '@/store/index';
::v-deep .u-form-item__body__right__message{ ::v-deep .u-form-item__body__right__message{
margin-top: 10rpx; margin-top: 10rpx;
color: #fff; color: #fff;
font-size: 26rpx;
} }
} }