xiaoning
/
yoga-manager-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiaoning:b42e546ad5302dcda846e017882bb6fce3563e1e
Branches Tags
xiaoning:master
..
compare: xiaoning:4d2a6296edfcef4cb6f884e4f21c1680f503c437
Branches Tags
xiaoning:master

No commits in common. 'b42e546ad5302dcda846e017882bb6fce3563e1e' and '4d2a6296edfcef4cb6f884e4f21c1680f503c437' have entirely different histories.
b42e546ad5 ... 4d2a6296ed

15 changed files with 418 additions and 528 deletions
Show Stats

4
.env.development
Unescape View File

@ -5,8 +5,8 @@ VUE_APP_TITLE = 若依商城管理系统,开源免费,软件开发,微信小程
ENV = 'development' ENV = 'development'
# 若依管理系统/开发环境 # 若依管理系统/开发环境
VUE_APP_BASE_API = 'https://mall.ichengle.top/api' #VUE_APP_BASE_API = 'https://mall.ichengle.top/api'
#VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

40
LICENSE
Unescape View File

@ -1,19 +1,21 @@
# Open Source License MIT License
ruoyi-mall is licensed under a modified version of the Apache License 2.0, with the following additional conditions: Copyright (c) 2022 Zhaochencheng
1. ruoyi-mall may be utilized commercially, including as a backend service for other applications or as an application development platform for enterprises. Should the conditions below be met, a commercial license must be obtained from the producer: Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
a. Multi-tenant service: Unless explicitly authorized by ruoyi-mall in writing, you may not use the ruoyi-mall source code to operate a multi-tenant environment. in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
b. LOGO and copyright information: In the process of using ruoyi-mall's frontend, you may not remove or moruoyi-mall the LOGO or copyright information in the ruoyi-mall console or applications. This restriction is inapplicable to uses of ruoyi-mall that do not involve its frontend. copies of the Software, and to permit persons to whom the Software is
- Frontend Definition: For the purposes of this license, the "frontend" of ruoyi-mall includes all components located in the web/ directory when running ruoyi-mall from the raw source code, or the "web" image when running ruoyi-mall with Docker. furnished to do so, subject to the following conditions:
2. As a contributor, you should agree that: The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
a. The producer can adjust the open-source agreement to be more strict or relaxed as deemed necessary.
b. Your contributed code may be used for commercial purposes, including but not limited to its cloud business operations. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache License 2.0. Detailed information about the Apache License 2.0 can be found at http://www.apache.org/licenses/LICENSE-2.0. FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
The interactive design of this product is protected by appearance patent. LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

1
README.md
Unescape View File

@ -37,6 +37,7 @@ npm run build:prod
http://mall.ichengle.top http://mall.ichengle.top
### 小程序和h5 ### 小程序和h5
<img src="doc/小程序演示.jpg" width="200px"> <img src="doc/小程序演示.jpg" width="200px">
<img src="doc/快递小程序.jpg" width="200px">
<img src="doc/h5演示.png" width="200px"> <img src="doc/h5演示.png" width="200px">
## CSDN若依技术专栏 ## CSDN若依技术专栏

16
src/api/ums/member.js
Unescape View File

@ -85,20 +85,4 @@ export function viewStatistics(memberId){
}) })
} }
export function getMiniWechatImg(params){
return request({
url: `/ums/member/wechat/code`,
method: 'get',
params
})
}
export function judgeQrCode(params){
return request({
url: `/no-auth/verified/code`,
method: 'get',
params
})
}

3
src/components/Editor/index.vue
Unescape View File

@ -195,6 +195,9 @@ export default {
</script> </script>
<style> <style>
.ql-editor{
line-height: 0;
}
.editor, .ql-toolbar { .editor, .ql-toolbar {
white-space: pre-wrap !important; white-space: pre-wrap !important;
line-height: normal !important; line-height: normal !important;

70
src/components/SeeAdsComponent.vue
Unescape View File

@ -1,70 +0,0 @@
<template>
<el-dialog title="扫描解锁" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<p>使用微信扫描下方二维码，观看完广告获取验证码</p>
<p class="red f13">注：如果第一次扫码未弹出广告，请重新扫码进入</p>
<div class="flex-center">
<el-image class="qr-code"
:src="'data:image/png;base64,'+ miniImg"
fit="fill"
></el-image>
<el-input v-model="qrCode" class="left-input"/>
<el-button @click="asyncOk" class="right-btn" type="primary" :disabled="!qrCode">提交</el-button>
</div>
</el-dialog>
</template>
<script>
import {getMiniWechatImg, judgeQrCode} from "@/api/ums/member";
import {mapGetters} from "vuex";
export default {
computed: {
...mapGetters(['roles'])
},
data() {
return {
open: false,
miniImg: null,
qrCode: null
}
},
methods: {
initMiniWechatImg() {
getMiniWechatImg({scene: 2}).then(res => {
this.miniImg = res.data
})
},
show() {
//如果是管理员的账号进入，直接过滤
if (this.roles.includes("admin")) {
this.$emit("confirmOk", true)
return
}
this.initMiniWechatImg()
this.open = true
},
async asyncOk(){
const res = await judgeQrCode({code: this.qrCode}).then(res=>{
return res.data
})
if (res) {
this.open = false
} else {
this.$message.error('验证码错误')
}
this.$emit("confirmOk", res)
}
}
}
</script>
<style lang="stylus">
.qr-code
min-width 150px
height 150px
margin 20px 20px 20px 0
.left-input
.el-input__inner
border-radius 4px 0 0 4px !important
.right-btn
border-radius 0 4px 4px 0 !important
</style>

4
src/layout/index.vue
Unescape View File

@ -5,14 +5,14 @@
<div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container"> <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
<div :class="{'fixed-header':fixedHeader}"> <div :class="{'fixed-header':fixedHeader}">
<navbar /> <navbar />
<!-- <tags-view v-if="needTagsView" />--> <tags-view v-if="needTagsView" />
</div> </div>
<app-main /> <app-main />
<right-panel> <right-panel>
<settings /> <settings />
</right-panel> </right-panel>
<div id="footer-global" :style="{left: !sidebar.opened ? '54px' : '200px'}"> <div id="footer-global" :style="{left: !sidebar.opened ? '54px' : '200px'}">
<p class="bolder-font large-tip">技术支持：关注“程序员诚哥”微信公众号，回复：支持</p> <p class="bolder-font large-tip">技术支持：关注“编写美好前程”微信公众号，回复：支持</p>
</div> </div>
</div> </div>
</div> </div>

3
src/style/base.styl
Unescape View File

@ -174,8 +174,7 @@ body
width 100% width 100%
.bolder-font .bolder-font
font-weight bolder font-weight bolder
.f13
font-size 13px
.large-tip .large-tip
font-size 16px font-size 16px
.dialog-form-two .dialog-form-two

22
src/views/index.vue
Unescape View File

@ -148,7 +148,7 @@
<script> <script>
import {str2Date} from '@/utils/date'; import {str2Date} from '@/utils/date';
import PanelGroup from '@/views/components/PanelGroup' import PanelGroup from '@/views/components/PanelGroup'
import {mapGetters} from 'vuex' import { mapGetters } from 'vuex'
import OrderLineChart from "@/views/dashboard/OrderLineChart.vue"; import OrderLineChart from "@/views/dashboard/OrderLineChart.vue";
import TopProduct from "@/views/components/IndexOrderPanelGroup/TopProduct.vue"; import TopProduct from "@/views/components/IndexOrderPanelGroup/TopProduct.vue";
import {memberAndCartStatistics, orderAndAftersaleStatistics} from "@/api/statistics"; import {memberAndCartStatistics, orderAndAftersaleStatistics} from "@/api/statistics";
@ -247,16 +247,16 @@ export default {
this.getData() this.getData()
}, },
methods: { methods: {
handleDateChange() { handleDateChange(){
this.getData(); this.getData();
}, },
initOrderCountDate() { initOrderCountDate(){
let start = new Date(); let start = new Date();
start.setFullYear(2018, 10, 1); start.setFullYear(2018, 10, 1);
const end = new Date(); const end = new Date();
end.setTime(start.getTime() + 1000 * 60 * 60 * 24 * 7); end.setTime(start.getTime() + 1000 * 60 * 60 * 24 * 7);
this.orderCountDate = [start, end]; this.orderCountDate=[start,end];
}, },
getData(){ getData(){
setTimeout(() => { setTimeout(() => {
this.chartData = { this.chartData = {

2
src/views/login.vue
Unescape View File

@ -80,7 +80,7 @@
</el-dialog> </el-dialog>
<!-- 底部 --> <!-- 底部 -->
<div class="el-login-footer"> <div class="el-login-footer">
<span>Copyright © 2017-2023 ichengle.top 技术支持：关注“程序员诚哥”微信公众号，回复：支持</span> <span>Copyright © 2017-2023 ichengle.top 技术支持：关注“编写美好前程”微信公众号，回复：支持</span>
</div> </div>
</div> </div>
</template> </template>

228
src/views/oms/aftersale/index.vue
Unescape View File

@ -1,115 +1,114 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="show"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form"> <el-form-item label="申请状态" prop="status">
<el-form-item label="申请状态" prop="status"> <DictRadio v-model="queryParams.status" :radioData="dict.type.oms_aftersale_status" size="small" :show-all="'all'" @change="handleQuery"></DictRadio>
<DictRadio v-model="queryParams.status" :radioData="dict.type.oms_aftersale_status" size="small" :show-all="'all'" @change="handleQuery"></DictRadio> </el-form-item>
</el-form-item> <el-form-item label="售后类型" prop="type">
<el-form-item label="售后类型" prop="type"> <DictRadio v-model="queryParams.type" :radioData="dict.type.oms_aftersale_type" size="small" :show-all="'all'" @change="handleQuery"></DictRadio>
<DictRadio v-model="queryParams.type" :radioData="dict.type.oms_aftersale_type" size="small" :show-all="'all'" @change="handleQuery"></DictRadio> </el-form-item>
</el-form-item> <el-form-item label="订单号" prop="orderSn">
<el-form-item label="订单号" prop="orderSn"> <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单号" clearable size="small"
<el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单号" clearable size="small" @keyup.enter.native="handleQuery" />
@keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> <el-form-item label="售后单号" prop="id">
<el-form-item label="售后单号" prop="id"> <el-input v-model.trim="queryParams.id" placeholder="请输入售后单号" clearable size="small"
<el-input v-model.trim="queryParams.id" placeholder="请输入售后单号" clearable size="small" @keyup.enter.native="handleQuery" />
@keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> <el-form-item label="会员手机号" prop="userPhone">
<el-form-item label="会员手机号" prop="userPhone"> <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable size="small"
<el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable size="small" @keyup.enter.native="handleQuery" />
@keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> <el-form-item label="创建时间" prop="Time">
<el-form-item label="创建时间" prop="Time"> <el-date-picker v-model="queryParams.Time" type="datetimerange" :picker-options="pickerOptions"
<el-date-picker v-model="queryParams.Time" type="datetimerange" :picker-options="pickerOptions" range-separator="至" size="small" format="yyyy-MM-dd HH:mm:ss"
range-separator="至" size="small" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" align="right"
align="right" @change="handleChange">
@change="handleChange"> </el-date-picker>
</el-date-picker> </el-form-item>
</el-form-item> <el-form-item class="flex_one tr">
<el-form-item class="flex_one tr"> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item>
</el-form-item> </el-form>
</el-form>
<el-table v-loading="loading" :data="omsAftersaleList" @selection-change="handleSelectionChange" border> <el-table v-loading="loading" :data="omsAftersaleList" @selection-change="handleSelectionChange" border>
<!-- <el-table-column type="selection" width="55" align="center" />--> <!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="售后单号" prop="id" width="160"/> <el-table-column label="售后单号" prop="id" width="160"/>
<el-table-column label="申请状态" prop="aftersaleStatus" width="80"> <el-table-column label="申请状态" prop="aftersaleStatus" width="80">
<template v-slot="scope"> <template v-slot="scope">
<el-tag effect="plain" size="medium" :type="getAftersaleStatusTag(scope.row)">{{ <el-tag effect="plain" size="medium" :type="getAftersaleStatusTag(scope.row)">{{
getAftersaleStatusText(scope.row) getAftersaleStatusText(scope.row)
}} }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户信息" prop="nickName" width="120"> <el-table-column label="用户信息" prop="nickName" width="120">
<template v-slot="scope"> <template v-slot="scope">
<div>{{ scope.row.nickName }}</div> <div>{{ scope.row.nickName }}</div>
<div>{{ scope.row.phone }}</div> <div>{{ scope.row.phone }}</div>
<div>{{ scope.row.mark }}</div> <div>{{ scope.row.mark }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="退款金额" prop="applyReturnAmount" width="120"/> <el-table-column label="退款金额" prop="applyReturnAmount" width="120"/>
<el-table-column label="售后类型" prop="applyRefundType" width="80"> <el-table-column label="售后类型" prop="applyRefundType" width="80">
<template v-slot="scope"> <template v-slot="scope">
<el-tag effect="plain" size="medium" :type="getAftersaleTypeTag(scope.row)">{{ <el-tag effect="plain" size="medium" :type="getAftersaleTypeTag(scope.row)">{{
getAftersaleTypeText(scope.row) getAftersaleTypeText(scope.row)
}} }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请时间" prop="applyRefundTime" width="180"> <el-table-column label="申请时间" prop="applyRefundTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.applyRefundTime, '') }}</span> <span>{{ parseTime(scope.row.applyRefundTime, '') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="处理时间" prop="handleTime" width="180"> <el-table-column label="处理时间" prop="handleTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.handleTime, '') }}</span> <span>{{ parseTime(scope.row.handleTime, '') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="原因" prop="reason" width="220"/> <el-table-column label="原因" prop="reason" width="220"/>
<el-table-column label="处理备注" prop="note" width="150"/> <el-table-column label="处理备注" prop="note" width="150"/>
<el-table-column label="处理人员" prop="handleMan" width="100"/> <el-table-column label="处理人员" prop="handleMan" width="100"/>
<el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right"> <el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{ scope.row.orderSn }} {{ scope.row.orderSn }}
<el-link @click="copy(scope.row.orderSn)" :underline="false"><i <el-link @click="copy(scope.row.orderSn)" :underline="false"><i
class="el-icon-document-copy el-icon--right"></i></el-link> class="el-icon-document-copy el-icon--right"></i></el-link>
</div> </div>
<el-button size="mini" type="text" @click="handleDetail(scope.row.orderId)" <el-button size="mini" type="text" @click="handleDetail(scope.row.orderId)"
v-hasPermi="['oms:aftersale:query']">详情 v-hasPermi="['oms:aftersale:query']">详情
</el-button> </el-button>
<el-button size="mini" type="text" @click="showLog(scope.row.orderId)" <el-button size="mini" type="text" @click="showLog(scope.row.orderId)"
v-hasPermi="['oms:aftersale:log']">日志 v-hasPermi="['oms:aftersale:log']">日志
</el-button> </el-button>
<el-button size="mini" type="text" @click="approve(scope.row, 1)" <el-button size="mini" type="text" @click="approve(scope.row, 1)"
v-if="scope.row.aftersaleStatus == 0" v-hasPermi="['manager:oms:aftersale:update']">同意 v-if="scope.row.aftersaleStatus == 0" v-hasPermi="['manager:oms:aftersale:update']">同意
</el-button> </el-button>
<el-button size="mini" type="text" @click="handleOpen(scope.row, 2)" class="red" <el-button size="mini" type="text" @click="handleOpen(scope.row, 2)" class="red"
v-if="scope.row.aftersaleStatus == 0" v-hasPermi="['manager:oms:aftersale:update']">拒绝 v-if="scope.row.aftersaleStatus == 0" v-hasPermi="['manager:oms:aftersale:update']">拒绝
</el-button> </el-button>
<el-button size="mini" type="text" @click="confirmReceive(scope.row, 3)" <el-button size="mini" type="text" @click="confirmReceive(scope.row, 3)"
v-if="scope.row.aftersaleStatus == 1 && scope.row.applyRefundType == 2" v-if="scope.row.aftersaleStatus == 1 && scope.row.applyRefundType == 2"
v-hasPermi="['manager:oms:aftersale:update']">确认收货 v-hasPermi="['manager:oms:aftersale:update']">确认收货
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<InBody v-show="total>0">
<pagination <InBody v-show="total>0">
:total="total" <pagination
:page.sync="queryParams.pageNum" :total="total"
:limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum"
@pagination="getList" :limit.sync="queryParams.pageSize"
/> @pagination="getList"
</InBody> />
</div> </InBody>
<!-- <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>-->
<!-- 拒绝对话框 --> <!-- 拒绝对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@ -152,15 +151,12 @@ import {
viewLog viewLog
} from "@/api/oms/aftersale"; } from "@/api/oms/aftersale";
import dateUtil from '@/utils/DateUtil'; import dateUtil from '@/utils/DateUtil';
import SeeAdsComponent from "@/components/SeeAdsComponent.vue";
export default { export default {
name: "OmsAftersale", name: "OmsAftersale",
components: {SeeAdsComponent},
dicts: ["oms_aftersale_type", "oms_aftersale_status"], dicts: ["oms_aftersale_type", "oms_aftersale_status"],
data() { data() {
return { return {
show: true,
pickerOptions: { pickerOptions: {
shortcuts: dateUtil.getTimeShort2() shortcuts: dateUtil.getTimeShort2()
}, },
@ -226,12 +222,6 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
confirmOk(success) {
if (success) {
this.show = true
this.getList();
}
},
copy(data) { copy(data) {
let url = data; let url = data;
let oInput = document.createElement('input'); let oInput = document.createElement('input');

58
src/views/oms/order/index.vue
Unescape View File

@ -130,6 +130,13 @@
<el-tag :type="getOrderStatusTag(scope.row.status)" style="margin-right: 10px"> <el-tag :type="getOrderStatusTag(scope.row.status)" style="margin-right: 10px">
{{ getOrderStatusText(scope.row.status) }} {{ getOrderStatusText(scope.row.status) }}
</el-tag> </el-tag>
<el-button
size="mini"
type="text"
@click="handleDelivery(scope.row)"
:disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
>编辑
</el-button>
</div> </div>
<div v-if="scope.row.deliverySn">物流单号：{{ scope.row.deliverySn }} <div v-if="scope.row.deliverySn">物流单号：{{ scope.row.deliverySn }}
<el-link @click="copy(scope.row.deliverySn)" :underline="false"><i <el-link @click="copy(scope.row.deliverySn)" :underline="false"><i
@ -138,9 +145,9 @@
<div v-if="scope.row.deliveryTime">发货时间：{{ parseTime(scope.row.deliveryTime, '') }}</div> <div v-if="scope.row.deliveryTime">发货时间：{{ parseTime(scope.row.deliveryTime, '') }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right" > <el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right">
<template slot-scope="scope" > <template slot-scope="scope">
<div style="float: right"> <div>
{{ scope.row.orderSn }} {{ scope.row.orderSn }}
<!-- <el-link--> <!-- <el-link-->
<!-- size="mini"--> <!-- size="mini"-->
@ -150,30 +157,27 @@
<el-link @click="copy(scope.row.orderSn)" :underline="false"><i <el-link @click="copy(scope.row.orderSn)" :underline="false"><i
class="el-icon-document-copy el-icon--right"></i></el-link> class="el-icon-document-copy el-icon--right"></i></el-link>
</div> </div>
<div style="float: right"> <el-button
<el-button size="mini"
size="mini" type="text"
type="text" @click="goDetail(scope.row)"
@click="goDetail(scope.row)" v-hasPermi="['oms:order:query']"
v-hasPermi="['oms:order:query']" >详情
>详情 </el-button>
</el-button> <el-button
<el-button size="mini"
size="mini" type="text"
type="text" @click="showLog(scope.row.id)"
@click="showLog(scope.row.id)" v-hasPermi="['oms:order:log']"
v-hasPermi="['oms:order:log']" >日志
>日志 </el-button>
</el-button> <el-button
<el-button size="mini"
size="mini" type="text"
type="text" @click="handleDelivery(scope.row)"
@click="handleDelivery(scope.row)" :disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
:disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3" >发货
>发货 </el-button>
</el-button>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

253
src/views/pms/product/index.vue
Unescape View File

@ -1,126 +1,122 @@
<template> <template>
<div class="app-container"> <div class="app-container" v-if="show">
<div v-show="show"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form"> <el-form-item label="上架状态" prop="publishStatus">
<el-form-item label="上架状态" prop="publishStatus"> <DictRadio v-model="queryParams.publishStatus" @change="handleQuery" size="small"
<DictRadio v-model="queryParams.publishStatus" @change="handleQuery" size="small" :radioData="dict.type.pms_publish_status" :showAll="'all'"/>
:radioData="dict.type.pms_publish_status" :showAll="'all'"/> </el-form-item>
</el-form-item> <el-form-item label="名称" prop="name">
<el-form-item label="名称" prop="name"> <el-input
<el-input v-model="queryParams.nameLike"
v-model="queryParams.nameLike" placeholder="请输入商品名称"
placeholder="请输入商品名称" clearable
clearable size="small"
size="small" @keyup.enter.native="handleQuery"
@keyup.enter.native="handleQuery" />
/> </el-form-item>
</el-form-item> <el-form-item label="品牌" prop="brandName">
<el-form-item label="品牌" prop="brandName"> <el-input
<el-input v-model="queryParams.brandNameLike"
v-model="queryParams.brandNameLike" placeholder="请输入品牌名称"
placeholder="请输入品牌名称" clearable
clearable size="small"
size="small" @keyup.enter.native="handleQuery"
@keyup.enter.native="handleQuery" />
/> </el-form-item>
</el-form-item> <el-form-item label="分类" prop="productCategoryName">
<el-form-item label="分类" prop="productCategoryName"> <el-input
<el-input v-model="queryParams.productCategoryNameLike"
v-model="queryParams.productCategoryNameLike" placeholder="请输入分类名称"
placeholder="请输入分类名称" clearable
clearable size="small"
size="small" @keyup.enter.native="handleQuery"
@keyup.enter.native="handleQuery" />
/> </el-form-item>
</el-form-item> <el-form-item label="编码" prop="outProductId">
<el-form-item label="编码" prop="outProductId"> <el-input
<el-input v-model="queryParams.outProductId"
v-model="queryParams.outProductId" placeholder="请输入商品编码"
placeholder="请输入商品编码" clearable
clearable size="small"
size="small" @keyup.enter.native="handleQuery"
@keyup.enter.native="handleQuery" />
/> </el-form-item>
</el-form-item> <el-form-item class="flex_one tr">
<el-form-item class="flex_one tr"> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item>
</el-form-item> </el-form>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button> <el-row :gutter="10" class="mb8">
</el-col> <el-col :span="1.5">
</el-row> <el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
<el-table v-loading="loading" :data="pmsProductList" @selection-change="handleSelectionChange" border> >新增</el-button>
<el-table-column type="selection" width="55" align="center"/> </el-col>
<el-table-column label="主图" prop="pic"> </el-row>
<template slot-scope="{ row }">
<el-image v-if="row.pic" :src="row.pic" :preview-src-list="[row.pic]" class="small-img"/>
</template>
</el-table-column>
<el-table-column label="名称/编码" min-width="200" prop="outProductId">
<template slot-scope="{ row }">
<div>名称：{{ row.name }}</div>
<div v-if="row.outProductId">编码：{{ row.outProductId }}</div>
</template>
</el-table-column>
<el-table-column label="品牌/分类" prop="brandName">
<template slot-scope="{ row }">
<div v-if="row.brandName">品牌：{{ row.brandName }}</div>
<div v-if="row.productCategoryName">分类：{{ row.productCategoryName }}</div>
</template>
</el-table-column>
<el-table-column label="价格/排序" prop="price">
<template slot-scope="{ row }">
<div v-if="row.price">价格：{{ row.price }}</div>
<div v-if="row.sort">排序：{{ row.sort }}</div>
</template>
</el-table-column>
<el-table-column label="上架状态" prop="publishStatus">
<template slot-scope="{ row }">
<dict-tag :value="row.publishStatus" prop-name="pms_publish_status"/>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<InBody v-show="total>0"> <el-table v-loading="loading" :data="pmsProductList" @selection-change="handleSelectionChange" border>
<pagination <el-table-column type="selection" width="55" align="center"/>
:total="total" <el-table-column label="主图" prop="pic">
:page.sync="queryParams.pageNum" <template slot-scope="{ row }">
:limit.sync="queryParams.pageSize" <el-image v-if="row.pic" :src="row.pic" :preview-src-list="[row.pic]" class="small-img"/>
@pagination="getList" </template>
/> </el-table-column>
</InBody> <el-table-column label="名称/编码" min-width="200" prop="outProductId">
</div> <template slot-scope="{ row }">
<!-- <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>--> <div>名称：{{ row.name }}</div>
<div v-if="row.outProductId">编码：{{ row.outProductId }}</div>
</template>
</el-table-column>
<el-table-column label="品牌/分类" prop="brandName">
<template slot-scope="{ row }">
<div v-if="row.brandName">品牌：{{ row.brandName }}</div>
<div v-if="row.productCategoryName">分类：{{ row.productCategoryName }}</div>
</template>
</el-table-column>
<el-table-column label="价格/排序" prop="price">
<template slot-scope="{ row }">
<div v-if="row.price">价格：{{ row.price }}</div>
<div v-if="row.sort">排序：{{ row.sort }}</div>
</template>
</el-table-column>
<el-table-column label="上架状态" prop="publishStatus">
<template slot-scope="{ row }">
<dict-tag :value="row.publishStatus" prop-name="pms_publish_status"/>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<InBody v-show="total>0">
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</InBody>
</div> </div>
</template> </template>
@ -128,15 +124,13 @@
import {delPmsProduct, listPmsProduct} from "@/api/pms/product"; import {delPmsProduct, listPmsProduct} from "@/api/pms/product";
import {isStarRepo} from "@/utils/is-star-plugin"; import {isStarRepo} from "@/utils/is-star-plugin";
import {mapGetters} from "vuex"; import {mapGetters} from "vuex";
import SeeAdsComponent from "@/components/SeeAdsComponent.vue";
export default { export default {
name: "PmsProduct", name: "PmsProduct",
components: {SeeAdsComponent},
dicts: ['pms_publish_status'], dicts: ['pms_publish_status'],
data() { data() {
return { return {
show: true, show: false,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 导出遮罩层 // 导出遮罩层
@ -175,22 +169,17 @@ export default {
}, },
}; };
}, },
created() { async created() {
this.getList(); const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/pms/product', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
this.show = res;
if (res) {
this.getList();
}
}, },
computed:{ computed:{
...mapGetters(['userId']), ...mapGetters(['userId']),
}, },
methods: { methods: {
async confirmOk(success) {
if (success) {
const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/pms/product', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
this.show = res;
if (res) {
this.getList();
}
}
},
/** 查询商品信息列表 */ /** 查询商品信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;

2
src/views/register.vue
Unescape View File

@ -61,7 +61,7 @@
</el-form> </el-form>
<!-- 底部 --> <!-- 底部 -->
<div class="el-register-footer"> <div class="el-register-footer">
<span>Copyright © 2017-2023 ichengle.top 技术支持：关注“程序员诚哥”微信公众号，回复：支持</span> <span>Copyright © 2017-2023 ichengle.top 技术支持：关注“编写美好前程”微信公众号，回复：支持</span>
</div> </div>
</div> </div>
</template> </template>

240
src/views/ums/member/index.vue
Unescape View File

@ -1,115 +1,114 @@
<template> <template>
<div class="app-container"> <div class="app-container" v-if="show">
<div v-show="show"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form"> <el-form-item label="创建时间">
<el-form-item label="创建时间"> <el-date-picker
<el-date-picker size="small"
size="small" v-model="dateRange"
v-model="dateRange" style="width: 240px"
style="width: 240px" value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd" type="daterange"
type="daterange" :clearable="true"
:clearable="true" :picker-options='pickerOptions'
:picker-options='pickerOptions' range-separator="-"
range-separator="-" start-placeholder="开始日期"
start-placeholder="开始日期" end-placeholder="结束日期"
end-placeholder="结束日期" ></el-date-picker>
></el-date-picker> </el-form-item>
</el-form-item> <!-- <el-form-item label="账号启用状态">-->
<!-- <el-form-item label="账号启用状态">--> <!-- <el-select v-model="queryParams.status" placeholder="请选择" :clearable="true" size="small">-->
<!-- <el-select v-model="queryParams.status" placeholder="请选择" :clearable="true" size="small">--> <!-- <el-option label="禁用" value="0">-->
<!-- <el-option label="禁用" value="0">--> <!-- </el-option>-->
<!-- </el-option>--> <!-- <el-option label="启用" value="1">-->
<!-- <el-option label="启用" value="1">--> <!-- </el-option>-->
<!-- </el-option>--> <!-- </el-select>-->
<!-- </el-select>--> <!-- </el-form-item>-->
<!-- </el-form-item>--> <el-form-item label="昵称" prop="nickname">
<el-form-item label="昵称" prop="nickname"> <el-input
<el-input v-model.trim="queryParams.nickname"
v-model.trim="queryParams.nickname" placeholder="请输入昵称"
placeholder="请输入昵称" clearable
clearable size="small"
size="small" />
/> </el-form-item>
</el-form-item> <el-form-item label="手机号码" prop="phone">
<el-form-item label="手机号码" prop="phone"> <el-input
<el-input v-model.trim="queryParams.phone"
v-model.trim="queryParams.phone" placeholder="请输入手机号码"
placeholder="请输入手机号码" clearable
clearable size="small"
size="small" />
/> </el-form-item>
</el-form-item> <el-form-item label="备注" prop="mark">
<el-form-item label="备注" prop="mark"> <el-select v-model="queryParams.hasMark" clearable size="small">
<el-select v-model="queryParams.hasMark" clearable size="small"> <el-option value="1" label="有备注" />
<el-option value="1" label="有备注" /> <el-option value="0" label="无备注"/>
<el-option value="0" label="无备注"/> </el-select>
</el-select> </el-form-item>
</el-form-item> <el-form-item class="flex_one tr">
<el-form-item class="flex_one tr"> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <!-- <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
<!-- <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>--> </el-form-item>
</el-form-item> </el-form>
</el-form>
<el-table v-loading="loading" :data="umsMemberList" border> <el-table v-loading="loading" :data="umsMemberList" border>
<el-table-column label="昵称" prop="nickname" width="150"/> <el-table-column label="昵称" prop="nickname" width="150"/>
<el-table-column label="手机号码" prop="phoneHidden" width="150"/> <el-table-column label="手机号码" prop="phoneHidden" width="150"/>
<el-table-column label="佣金" width="120"> <el-table-column label="佣金" width="120">
<template v-slot="scope"> <template v-slot="scope">
<div>0.00</div> <div>0.00</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="积分" width="120"> <el-table-column label="积分" width="120">
<template v-slot="scope"> <template v-slot="scope">
<div>0.00</div> <div>0.00</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="余额" width="120"> <el-table-column label="余额" width="120">
<template v-slot="scope"> <template v-slot="scope">
<div>0.00</div> <div>0.00</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="注册时间" prop="createTime" width="180"> <el-table-column label="注册时间" prop="createTime" width="180">
<template v-slot="scope"> <template v-slot="scope">
<div>{{ parseTime(scope.row.createTime) }}</div> <div>{{ parseTime(scope.row.createTime) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上次登录" prop="createTime"> <el-table-column label="上次登录" prop="createTime">
<template v-slot="scope"> <template v-slot="scope">
<div>{{ parseTime(scope.row.createTime) }}</div> <div>{{ parseTime(scope.row.createTime) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注"> <el-table-column label="备注">
<template v-slot="scope"> <template v-slot="scope">
<span class="mr10">{{scope.row.mark}}</span> <span class="mr10">{{scope.row.mark}}</span>
<i class="el-icon-edit pointer" @click="showUpdateMark(scope.row)"></i> <i class="el-icon-edit pointer" @click="showUpdateMark(scope.row)"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" fix="right" width="200"> <el-table-column label="操作" class-name="small-padding fixed-width" fix="right" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="showStatistics(scope.row.id)" @click="showStatistics(scope.row.id)"
v-hasPermi="['ums:member:statistics']" v-hasPermi="['ums:member:statistics']"
>查看数据 >查看数据
</el-button> </el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="goOrder(scope.row.phoneEncrypted)" @click="goOrder(scope.row.phoneEncrypted)"
>查看下单</el-button> >查看下单</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="goCart(scope.row.phoneEncrypted)" @click="goCart(scope.row.phoneEncrypted)"
>查看购物车</el-button> >查看购物车</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<InBody v-show="total>0"> <InBody v-show="total>0">
<pagination <pagination
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
@ -117,8 +116,6 @@
@pagination="getList" @pagination="getList"
/> />
</InBody> </InBody>
</div>
<SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>
<!-- 统计 --> <!-- 统计 -->
<el-dialog :title="statisticsObj.title" :visible.sync="statisticsObj.open" width="500px" append-to-body> <el-dialog :title="statisticsObj.title" :visible.sync="statisticsObj.open" width="500px" append-to-body>
<el-descriptions direction="vertical" :column="2" border> <el-descriptions direction="vertical" :column="2" border>
@ -154,11 +151,9 @@ import {
import dateUtil from '@/utils/DateUtil'; import dateUtil from '@/utils/DateUtil';
import {isStarRepo} from "@/utils/is-star-plugin"; import {isStarRepo} from "@/utils/is-star-plugin";
import {mapGetters} from "vuex"; import {mapGetters} from "vuex";
import SeeAdsComponent from "@/components/SeeAdsComponent.vue";
export default { export default {
name: "UmsMember", name: "UmsMember",
components: {SeeAdsComponent},
data() { data() {
return { return {
show: false, show: false,
@ -225,23 +220,16 @@ export default {
}; };
}, },
async created() { async created() {
this.$nextTick(()=>{ const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/member/member', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
this.$refs.seeAdsComponentRef.show() this.show = res;
}) if (res) {
this.getList();
}
}, },
computed:{ computed:{
...mapGetters(['userId']), ...mapGetters(['userId']),
}, },
methods: { methods: {
async confirmOk(success) {
if (success) {
const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/member/member', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
this.show = res;
if (res) {
this.getList();
}
}
},
showUpdateMark(record){ showUpdateMark(record){
this.remarkModal = { this.remarkModal = {
visible: true, visible: true,

Write Preview
Loading…
Cancel
Save