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-20 16:05:22 +08:00
parent 25ada6fdb9
commit a423661c5e
9 changed files with 97 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,6 +1,6 @@
FROM openjdk:8-jre-alpine FROM openjdk:8-jre-alpine
#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
##安装字体 ##安装字体
#RUN apk --no-cache add ttf-dejavu RUN apk --no-cache add ttf-dejavu
COPY ruoyi-admin.jar /app/app.jar COPY ruoyi-admin.jar /app/app.jar
ENTRYPOINT ["java","-Duser.timezone=GMT+08","-jar","/app/app.jar"] ENTRYPOINT ["java","-Duser.timezone=GMT+08","-jar","/app/app.jar"]

8
mini-app/src/baseDefine.js
View File

@ -4,11 +4,9 @@
* *
*/ */
export const baseUrl = 'http://127.0.0.1:18989/' // export const baseUrl = 'http://127.0.0.1:18989/'
// export const baseUrl = 'http://36.1.51.30:18989/' export const baseUrl = 'https://mall.xiao4r.com/api/'
// export const baseUrl = 'http://41.liyiren.me:8696/'
// export const baseUrl = 'http://36.1.50.18:18989/'
// export const baseUrl = 'https://www.xiao4r.com/wine/winery/'
export const imgbaseUrl = 'https://www.xiao4r.com/xiao4rstatic/img/winery/' export const imgbaseUrl = 'https://www.xiao4r.com/xiao4rstatic/img/winery/'
export const sysImgBaseUrl = 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' export const sysImgBaseUrl = 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/'

93
mini-app/src/components/mall/tab/mall-bbs.wpy
View File

@ -9,61 +9,64 @@
</style> </style>
<template> <template>
<div> <div class="contianer">
<van-panel v-for="(item,index) in list" :key="index" :title="item.user" desc="三星客户" status=" " use-footer-slot>
<van-row>
<van-col span="8">
<van-image src="https://img.yzcdn.cn/vant/cat.jpeg" />
</van-col>
<van-col span="8">span: 8</van-col>
</van-row>
<view style="display: flex;font-size: 14px;">{{item.context}}</view> <van-image :src="imageDefine.BBS_BG">
<van-grid column-num="3" border="{{ false }}"> <!-- <van-panel v-for="(item,index) in list" :key="index" :title="item.user" desc="三星客户" status=" " use-footer-slot>-->
<van-grid-item use-slot v-for=" 3 " wx:for-item="index"> <!-- <van-row>-->
<image <!-- <van-col span="8">-->
style="width: 100%; height: 90px;" <!-- <van-image src="https://img.yzcdn.cn/vant/cat.jpeg" />-->
src="https://img.yzcdn.cn/vant/apple-{{ index + 1 }}.jpg" <!-- </van-col>-->
/> <!-- <van-col span="8">span: 8</van-col>-->
</van-grid-item> <!-- </van-row>-->
</van-grid>
<van-divider /> <!-- <view style="display: flex;font-size: 14px;">{{item.context}}</view>-->
<view style="display: flex;font-size: 14px;">
<span style="color: cornflowerblue;">用户xxx<span
style="color: #333333;">的回复: 内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺</span></span>
</view> <!-- <van-grid column-num="3" border="{{ false }}">-->
<view slot="footer"> <!-- <van-grid-item use-slot v-for=" 3 " wx:for-item="index">-->
<view style="display: flex;justify-content: flex-end;"> <!-- <image-->
<van-button v-if="true" size="small">删除</van-button> <!-- style="width: 100%; height: 90px;"-->
<van-button v-if="true" size="small" type="danger" style="margin-left: 10px;">编辑</van-button> <!-- src="https://img.yzcdn.cn/vant/apple-{{ index + 1 }}.jpg"-->
<van-button size="small" type="danger" style="margin-left: 10px;" @tap="onReply(item)">回复</van-button> <!-- />-->
</view> <!-- </van-grid-item>-->
</view> <!-- </van-grid>-->
</van-panel>
<!-- <van-divider />-->
<!-- <view style="display: flex;font-size: 14px;">-->
<!-- <span style="color: cornflowerblue;">用户xxx<span-->
<!-- style="color: #333333;">的回复: 内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺</span></span>-->
<!-- </view>-->
<!-- <view slot="footer">-->
<!-- <view style="display: flex;justify-content: flex-end;">-->
<!-- <van-button v-if="true" size="small">删除</van-button>-->
<!-- <van-button v-if="true" size="small" type="danger" style="margin-left: 10px;">编辑</van-button>-->
<!-- <van-button size="small" type="danger" style="margin-left: 10px;" @tap="onReply(item)">回复</van-button>-->
<!-- </view>-->
<!-- </view>-->
<!-- </van-panel>-->
<van-dialog <!-- <van-dialog-->
use-slot <!-- use-slot-->
title="标题" <!-- title="标题"-->
show="{{ isShowInput }}" <!-- show="{{ isShowInput }}"-->
show-cancel-button <!-- show-cancel-button-->
bind:close="onCloseInput" <!-- bind:close="onCloseInput"-->
bind:confirm="onConfirmInput" <!-- bind:confirm="onConfirmInput"-->
> <!-- >-->
<image src="https://img.yzcdn.cn/1.jpg" /> <!-- <image src="https://img.yzcdn.cn/1.jpg" />-->
</van-dialog> <!-- </van-dialog>-->
<div style="margin-top: 100px;" /> <!-- <div style="margin-top: 100px;" />-->
</div> </div>
</template> </template>
<script> <script>
import wepy from '@wepy/core' import wepy from '@wepy/core'
import store from '@/store' import store from '@/store'
import { mapActions } from '@wepy/x' import { mapActions, mapState } from '@wepy/x'
wepy.component({ wepy.component({
store, store,
@ -76,7 +79,11 @@ wepy.component({
}, },
computed: {}, computed: {
...mapState({
'imageDefine': state => state.imageDefine
})
},
methods: { methods: {

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

@ -10,7 +10,7 @@
} }
.user-info { .user-info {
margin-top: 100px; margin-top: 130px;
margin-left: 20px; margin-left: 20px;
margin-right: 20px; margin-right: 20px;
display: flex; display: flex;
@ -67,7 +67,7 @@
<div class="container" style="margin: 10px 10px 80px 10px;"> <div class="container" style="margin: 10px 10px 80px 10px;">
<div class="user-info"> <div class="user-info">
<van-image round width="90rpx" height="90rpx" :src="user.userInfo.avatarUrl" /> <van-image round width="120rpx" height="120rpx" :src="user.userInfo.avatarUrl" />
<div class="user-info-msg"> <div class="user-info-msg">
<span style="font-size: 18px;font-weight: bold;">{{user.userInfo.nickName}}</span> <span style="font-size: 18px;font-weight: bold;">{{user.userInfo.nickName}}</span>
<span style="font-size: 12px;">{{user.mobile}}</span> <span style="font-size: 12px;">{{user.mobile}}</span>
@ -95,7 +95,7 @@
<van-divider /> <van-divider />
<van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;"> <van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;">
<van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU1" @tap="onNavItem(item)"> <van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU1" @tap="onNavItem(item)">
<van-image round width="90rpx" height="90rpx" :src="item.icon" /> <van-image width="48rpx" height="40rpx" :src="item.icon" />
<span style="margin-top: 10px;">{{item.name}} </span> <span style="margin-top: 10px;">{{item.name}} </span>
</van-grid-item> </van-grid-item>
</van-grid> </van-grid>
@ -106,7 +106,7 @@
<van-divider /> <van-divider />
<van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;"> <van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;">
<van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU2" @tap="onNavItem(item)"> <van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU2" @tap="onNavItem(item)">
<van-image round width="90rpx" height="90rpx" :src="item.icon" /> <van-image width="48rpx" height="40rpx" :src="item.icon" />
<span style="margin-top: 10px;">{{item.name}} </span> <span style="margin-top: 10px;">{{item.name}} </span>
</van-grid-item> </van-grid-item>
</van-grid> </van-grid>

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

@ -5,32 +5,32 @@ import { orderDetailListPage, orderListPage, userAddressListPage } from './pages
export const myMenuList1 = [ export const myMenuList1 = [
{ {
name: '全部订单', name: '全部订单',
icon: imgbaseUrl + 'doctor.png', icon: imgbaseUrl + '/my/order_1.png',
path: orderListPage path: orderListPage
}, },
{ {
name: '待付款', name: '待付款',
icon: imgbaseUrl + 'doctor.png', icon: imgbaseUrl + '/my/order_2.png',
path: orderListPage + '?orderStatus=1' path: orderListPage + '?orderStatus=1'
}, { }, {
name: '待收货', name: '待收货',
icon: imgbaseUrl + 'doctor.png', icon: imgbaseUrl + '/my/order_3.png',
path: orderListPage + '?orderStatus=2' path: orderListPage + '?orderStatus=2'
} }
] ]
export const myMenuList2 = [ export const myMenuList2 = [
{ {
name: '地址管理', name: '地址管理',
icon: imgbaseUrl + 'doctor.png', icon: imgbaseUrl + '/my/tool_1.png',
path: userAddressListPage path: userAddressListPage
}, },
{ {
name: '退款管理', name: '退款管理',
icon: imgbaseUrl + 'doctor.png', icon: imgbaseUrl + '/my/tool_2.png',
path: orderDetailListPage path: orderDetailListPage
}, { }, {
name: '优惠券', name: '优惠券',
icon: imgbaseUrl + 'doctor.png', icon: imgbaseUrl + '/my/tool_3.png',
path: '' path: ''
} }
] ]

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

@ -75,3 +75,6 @@ spring:
max-active: 8 max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制） # #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms max-wait: -1ms
wxmini:
notifyUrl: http://41.liyiren.me:8696/winery/order/pay/payNotify

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

@ -75,3 +75,6 @@ spring:
max-active: 8 max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制） # #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms max-wait: -1ms
wxmini:
notifyUrl: https://mall.xiao4r.com/api/winery/order/pay/payNotify

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

@ -192,20 +192,7 @@ xss:
# 匹配链接 # 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/* urlPatterns: /system/*,/monitor/*,/tool/*
#微信小程序支付配置
wxmini:
appId: wx76ec015fc31a1946 #微信公众号或者小程序等的appid 必填
mchId: 1486984962
mchKey: 82aZ9Tb6eu5W2HdXKQWZU2SztU8w8nJ8
notifyUrl: http://41.liyiren.me:8696/winery/order/pay/payNotify
subAppId: #服务商模式下的子商户公众账号ID
subMchId: #服务商模式下的子商户号
tradeType: JSAPI #交易类型
keyPath: "classpath:/cert/apiclient_cert1486984962.p12" # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
secret: 94ee42c0899a6ceccf353e1e729c50d4 #微信小程序的Secret
token: xiao4r #微信小程序消息服务器配置的token
aesKey: jNXajd2sQSMYQNg3rcdMF9HraUJxXF0iswgdMxVik9W #微信小程序消息服务器配置的EncodingAESKey
msgDataFormat: JSON
# cos存储配置 # cos存储配置
tencent-cos: tencent-cos:
@ -214,3 +201,19 @@ tencent-cos:
secretId: AKIDovztW8x0DpQnunSw2uXUDhw3IH0fQC75 secretId: AKIDovztW8x0DpQnunSw2uXUDhw3IH0fQC75
secretKey: rCH8tOfjX5XjegYBXfkZWc2E75nJq9Dx secretKey: rCH8tOfjX5XjegYBXfkZWc2E75nJq9Dx
region: ap-beijing region: ap-beijing
#微信小程序支付配置
wxmini:
appId: wx76ec015fc31a1946 #微信公众号或者小程序等的appid 必填
mchId: 1486984962
mchKey: 82aZ9Tb6eu5W2HdXKQWZU2SztU8w8nJ8
subAppId: #服务商模式下的子商户公众账号ID
subMchId: #服务商模式下的子商户号
tradeType: JSAPI #交易类型
keyPath: "classpath:/cert/apiclient_cert1486984962.p12" # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
secret: 94ee42c0899a6ceccf353e1e729c50d4 #微信小程序的Secret
token: xiao4r #微信小程序消息服务器配置的token
aesKey: jNXajd2sQSMYQNg3rcdMF9HraUJxXF0iswgdMxVik9W #微信小程序消息服务器配置的EncodingAESKey
msgDataFormat: JSON

2
ruoyi-ui/.env.production
View File

@ -3,4 +3,4 @@ ENV = 'production'
# 若依管理系统/生产环境 # 若依管理系统/生产环境
# VUE_APP_BASE_API = 'https://mall.xiao4r.com/api' # VUE_APP_BASE_API = 'https://mall.xiao4r.com/api'
VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/api'