abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

基本完成

Browse Source
This commit is contained in:
mactj 2021-01-22 13:25:06 +08:00
parent be8f6b7576
commit 0e7d0de1ba
21 changed files with 8155 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8079
doc/2021-01-21.sql Normal file
View File

File diff suppressed because one or more lines are too long

8
hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderDetailController.java
View File

@ -41,6 +41,8 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import static com.ruoyi.common.core.domain.AjaxResult.error;
import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
import static com.ruoyi.common.utils.SecurityUtils.isMiniUser;
/**
* 订单明细Controller
@ -96,6 +98,12 @@ public class AppOrderDetailController extends BaseController {
if (appOrderDetail.getRefundTime() != null) {
lqw.eq(AppOrderDetail::getRefundTime, appOrderDetail.getRefundTime());
}
if (isMiniUser()) {
lqw.eq(AppOrderDetail::getUserId, getLoginUser().getUser().getUserId());
}
lqw.orderByDesc(AppOrderDetail::getCreateTime);
List<AppOrderDetail> list = iAppOrderDetailService.list(lqw);
for (AppOrderDetail detail : list) {

2
mini-app/project.config.json
View File

@ -151,4 +151,4 @@
]
}
}
}
}

16
mini-app/src/appManager.js
View File

@ -2,6 +2,7 @@ import store from '@/store'
import eventHub from './common/eventHub'
import userApis from './apis/userApis'
import { webViewPage } from './store/constant/nav/pages'
import Dialog from './vant/dialog/dialog'
class AppManager {
login(callBack) {
@ -89,9 +90,12 @@ class AppManager {
navigateTo(path) {
console.log('path:', path)
if (path === 'customer') {
this.showDialog('温馨提示', '客服热线：17395097925')
}
if (!store.state.user.token) {
eventHub.$emit('onShowDialogUserInfo')
eventHub.$emit('onShowDialogRegist')
return
}
@ -114,6 +118,16 @@ class AppManager {
this.navigateTo(webViewPage)
}
showDialog(title,msg) {
Dialog.alert({
title: title,
message: msg,
}).then(() => {
// on close
})
}
}
export default new AppManager()

8
mini-app/src/components/mall/tab/mall-home.wpy
View File

@ -101,10 +101,14 @@ module.exports.parseImage = parseImage;
</div>
</van-col>
<van-col offset="1" span="7" v-if="hotSwitch">
<van-button round style="height: 25px;" size="small" plain color="#AC1630" @tap="onShoppingCar">
<van-button v-if="user.token" round style="height: 25px;" size="small" plain color="#AC1630"
@tap="onShoppingCar">
<van-icon name="shopping-cart-o" color="#AC1630" />
<span style="margin-left: 5px;color: #333333;">购物车</span>
</van-button>
<van-button v-else round style="height: 25px;" size="small" plain color="#AC1630" @tap="onShoppingCar">
<span style="margin-left: 5px;color: #333333;">点击登录</span>
</van-button>
</van-col>
</van-row>
@ -187,7 +191,7 @@ module.exports.parseImage = parseImage;
<van-image width="100%" :height="item.imageHeight + 'px'" :src="filters.parseImage(item.image)"
@tap="onWebItem(item)" />
@tap="onWebItem(item)" />
</div>
<!-- <div class="column-record-item" v-for="(item, index) in columnRecord" @tap="onNavItem(navDefine.HOME_BANNER2)">-->

19
mini-app/src/components/mall/tab/mall-my.wpy
View File

@ -112,15 +112,16 @@
</van-grid>
</div>
<!-- <div class="grid-body">-->
<!-- <span style="margin:25px 10px 15px 10px;font-weight: bold;">更多推荐</span>-->
<!-- <van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;">-->
<!-- <van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU3" @tap="onNavItem(item)">-->
<!-- <van-image round width="90rpx" height="90rpx" :src="item.icon" />-->
<!-- <span style="margin-top: 10px;">{{item.name}} </span>-->
<!-- </van-grid-item>-->
<!-- </van-grid>-->
<!-- </div>-->
<div class="grid-body">
<span style="margin:25px 10px 15px 10px;font-weight: bold;">其他</span>
<van-divider />
<van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;">
<van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU3" @tap="onNavItem(item)">
<van-image width="48rpx" height="48rpx" :src="item.icon" />
<span style="margin-top: 10px;">{{item.name}} </span>
</van-grid-item>
</van-grid>
</div>
<div style="margin-top: 100px;" />

1
mini-app/src/components/nav-bar.wpy
View File

@ -7,6 +7,7 @@
<template>
<van-nav-bar
bind:click-left="onBack"
fixed
border="{{false}}"
z-index="100"
custom-style="background:#AC1630;color:#FFF;"

5
mini-app/src/components/user/dialog-registration.wpy
View File

@ -153,7 +153,6 @@ wepy.component({
detail: e.$wx.detail
})
console.log(rsp)
if (rsp.code === 200) {
this.setMobileAction(rsp.data.mobile)
} else {
@ -193,10 +192,8 @@ wepy.component({
}
})
console.log(this)
this.page = this
eventHub.$on('onShowDialogUserInfo', (...args) => {
eventHub.$on('onShowDialogRegist', (...args) => {
this.isShow = true
})
}

4
mini-app/src/pages/mall/goods/goods-detail.wpy
View File

@ -19,9 +19,9 @@ module.exports.parseImage = parseImage;
<div class="container">
<van-loading v-if="!goodsItem" style="margin-top: 20px;" />
<van-loading v-if="!goodsItem" style="margin-top: 200px;" />
<div v-else style="margin-bottom: 80px; width: 100%;">
<div v-else style="margin-top:66px;margin-bottom: 80px; width: 100%;">
<swiper indicator-dots="true" autoplay="true" interval="3000" style="height: 750rpx;">
<block v-for="(item,index) in goodsImages" wx:key="index">

4
mini-app/src/pages/mall/index.wpy
View File

@ -95,6 +95,7 @@ module.exports.getTime = getTime;
<mall-bbs v-else-if="pageIndex === 2" @changeTab="changeTab" />
<mall-my v-else-if="pageIndex === 3" />
<dialog-registration />
<van-dialog id="van-dialog" />
</template>
@ -139,7 +140,7 @@ wepy.page({
},
onChange(event) {
if (!this.user.token) {
eventHub.$emit('onShowDialogUserInfo')
eventHub.$emit('onShowDialogRegist')
return
}
this.pageIndex = event.$wx.detail
@ -168,6 +169,7 @@ wepy.page({
ready() {
this.init()
// eventHub.$emit('onShowDialogRegist')
// appManager.login()
},
onShow() {

12
mini-app/src/pages/mall/order/order-check.wpy
View File

@ -7,7 +7,7 @@ page {
border-radius: 25px;
width: 660rpx;
margin-top: 20px;
background-color: white;
//box-shadow: 4px 4px 10px #eeeeee;
padding: 10px 10px 10px 10px;
@ -29,20 +29,20 @@ module.exports.parseImage = parseImage;
<nav-bar title="确认订单" />
<div class="" style="width: 100%;margin:15px;">
<div class="" style="width: 100%;margin-top:66px;">
<van-loading v-if="!isInit" style="margin-top: 20px;justify-content: center;"></van-loading>
<van-loading v-if="!isInit" style="margin-top: 200px;justify-content: center;"></van-loading>
<view wx:else>
<div v-if="!currentAddress" style="display: flex;flex-direction: column;align-items: center;width: 100%;">
<div v-if="!currentAddress" style="display: flex;flex-direction: column;align-items: center;width: 100%;margin-top: 66px;">
<van-empty description="您还没有添加收货地址" />
<div style="width: 600rpx;">
<van-button round type="info" size="large" @tap="onAdd">点击添加</van-button>
</div>
</div>
<div v-else class="fream" >
<div v-else class="fream" style="margin: 60px 15px 20px 15px;" >
<div style="display: flex; justify-content: space-between;">
<van-icon name="home-o" size="60rpx" />
@ -68,7 +68,7 @@ module.exports.parseImage = parseImage;
</div>
<div class="fream">
<div class="fream" style="margin: 20px 15px 20px 15px;">
<van-card

2
mini-app/src/pages/mall/order/order-detail-list.wpy
View File

@ -14,7 +14,7 @@ module.exports.parseImage = parseImage;
<nav-bar title="退款记录" />
<div style="width: 100%;">
<div style="width: 100%;margin-top:66px;">
<van-tabs active="{{ activeTab }}" bind:change="onChangeTab">

2
mini-app/src/pages/mall/order/order-list.wpy
View File

@ -14,7 +14,7 @@ module.exports.parseImage = parseImage;
<nav-bar title="我的订单" />
<div style="width: 100%;">
<div style="width: 100%;margin-top:66px;">
<van-tabs active="{{ activeTab }}" bind:change="onChangeTab">

2
mini-app/src/pages/mall/shopping-car/shopping-car-list.wpy
View File

@ -14,7 +14,7 @@ module.exports.parseImage = parseImage;
<nav-bar title="我的购物车" />
<div style="width: 100%;">
<div style="width: 100%;margin-top:66px;">
<van-loading wx:if="{{ !isInit }}" style="margin-top: 20px;"></van-loading>
<view wx:else>

4
mini-app/src/pages/mall/user/user-address-list.wpy
View File

@ -35,7 +35,7 @@
<nav-bar title="地址管理" />
<div class="container" style="margin: 15px;">
<div class="container" style="margin-top:66px;">
<van-loading wx:if="{{ !isInit }}" style="margin-top: 20px;"></van-loading>
<view wx:else>
@ -88,7 +88,7 @@
<div style="margin-top: 20px;">
<van-button round type="info" size="large" @tap="onAdd">+ 新建收获地址</van-button>
<van-button round type="info" size="large" @tap="onAdd">+ 新建收货地址</van-button>
</div>
</view>

4
mini-app/src/pages/news/news-detail.wpy
View File

@ -69,8 +69,8 @@ module.exports.parseImage = parseImage;
<nav-bar :title="newItem.newsTitle" />
<div class="container">
<van-loading v-if="!newItem" style="margin-top: 20px;" />
<div class="container" style="margin-top: 66px;">
<van-loading v-if="!newItem" style="margin-top: 136px;" />
<div v-else style="margin-bottom: 80px;">
<div style="margin: 10px 15px;display: flex;flex-direction: column;">

2
mini-app/src/pages/winery/winery-detail.wpy
View File

@ -69,7 +69,7 @@ module.exports.parseImage = parseImage;
<nav-bar title="酒庄信息" />
<div class="container">
<div class="container" style="margin-top: 66px;">
<van-loading v-if="!wineryItem" style="margin-top: 20px;" />
<div v-else style="margin-bottom: 80px;">
<image :src="filters.parseImage(wineryItem.topImage)" style="width: 100%;height: 750rpx;" mode="aspectFit" />

11
mini-app/src/pages/winery/winery-list.wpy
View File

@ -99,16 +99,7 @@ module.exports.parseAwards = parseAwards;
<template>
<van-nav-bar
bind:click-left="onBack"
border="{{false}}"
fixed
z-index="100"
custom-style="background:#AC1630;color:#FFF;"
>
<van-icon name="arrow-left" slot="left" color="#fff" />
<span style="color: #fff;" slot="title">酒庄介绍</span>
</van-nav-bar>
<nav-bar title="酒庄介绍" />
<!-- <div class="bg" />-->
<div class="container" style="margin-top: 66px;width: 100%;">

25
mini-app/src/store/constant/nav/my.js
View File

@ -28,26 +28,23 @@ export const myMenuList2 = [
name: '退款管理',
icon: imgbaseUrl + '/my/tool_2.png',
path: orderDetailListPage
}, {
name: '隐私政策',
icon: imgbaseUrl + '/my/tool_3.png',
path: newsDetailPage + '?id=' + 'a1e5ec18ae13036d14c94bf0e5d11756'
}
]
export const myMenuList3 = [
{
name: '关注',
icon: imgbaseUrl + 'doctor.png',
path: ''
name: '客服热线',
icon: imgbaseUrl + '/my/more_1.png',
path: 'customer'
},
{
name: '在线客服',
icon: imgbaseUrl + 'doctor.png',
path: ''
}, {
name: '条款政策',
icon: imgbaseUrl + 'doctor.png',
path: ''
name: '隐私政策',
icon: imgbaseUrl + '/my/more_2.png',
path: newsDetailPage + '?id=' + 'a1e5ec18ae13036d14c94bf0e5d11756'
},
{
name: '服务条款',
icon: imgbaseUrl + '/my/more_3.png',
path: newsDetailPage + '?id=' + 'fb4109a4020b2a2a9d1172f66d043897'
}
]

6
ruoyi-admin/src/main/resources/application.yml
View File

@ -206,11 +206,9 @@ tencent-cos:
#微信小程序支付配置
wxmini:
# appId: wx76ec015fc31a1946 # 宁夏通
appId: wx4306452d346f783d # 紫色名片
appId: wx4306452d346f783d # 紫色名片
# secret: 94ee42c0899a6ceccf353e1e729c50d4 # 宁夏通
secret: dc55bc1729090bdff9b63e1a5f0d03b2 # 紫色名片
secret: dc55bc1729090bdff9b63e1a5f0d03b2 # 紫色名片
mchId: 1486984962
mchKey: 82aZ9Tb6eu5W2HdXKQWZU2SztU8w8nJ8

1
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.core.domain.BaseEntity;