From a423661c5e1f2d4fd6350a57aadc36ef68cb9884 Mon Sep 17 00:00:00 2001
From: mactj <tottimctj@163.com>
Date: Wed, 20 Jan 2021 16:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                    |  4 +-
 mini-app/src/baseDefine.js                    |  8 +-
 mini-app/src/components/mall/tab/mall-bbs.wpy | 93 ++++++++++---------
 mini-app/src/components/mall/tab/mall-my.wpy  |  8 +-
 mini-app/src/store/constant/nav/my.js         | 12 +--
 .../src/main/resources/application-dev.yml    | 17 ++--
 .../src/main/resources/application-prod.yml   |  5 +-
 .../src/main/resources/application.yml        | 31 ++++---
 ruoyi-ui/.env.production                      |  2 +-
 9 files changed, 97 insertions(+), 83 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 288cfbe59..9b241be17 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 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
 ENTRYPOINT ["java","-Duser.timezone=GMT+08","-jar","/app/app.jar"]
diff --git a/mini-app/src/baseDefine.js b/mini-app/src/baseDefine.js
index 2d618e2d3..d63b249de 100644
--- a/mini-app/src/baseDefine.js
+++ b/mini-app/src/baseDefine.js
@@ -4,11 +4,9 @@
  *
  */
 
-export const baseUrl = 'http://127.0.0.1:18989/'
-// export const baseUrl = 'http://36.1.51.30:18989/'
-// 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 baseUrl = 'http://127.0.0.1:18989/'
+export const baseUrl = 'https://mall.xiao4r.com/api/'
+
 
 export const imgbaseUrl = 'https://www.xiao4r.com/xiao4rstatic/img/winery/'
 export const sysImgBaseUrl = 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/'
diff --git a/mini-app/src/components/mall/tab/mall-bbs.wpy b/mini-app/src/components/mall/tab/mall-bbs.wpy
index 50d87dfe2..bfd132ec9 100644
--- a/mini-app/src/components/mall/tab/mall-bbs.wpy
+++ b/mini-app/src/components/mall/tab/mall-bbs.wpy
@@ -9,61 +9,64 @@
 
 </style>
 <template>
-  <div>
-    <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>
+  <div class="contianer">
 
-      <view style="display: flex;font-size: 14px;">{{item.context}}</view>
+    <van-image :src="imageDefine.BBS_BG">
 
-      <van-grid column-num="3" border="{{ false }}">
-        <van-grid-item use-slot v-for=" 3 " wx:for-item="index">
-          <image
-            style="width: 100%; height: 90px;"
-            src="https://img.yzcdn.cn/vant/apple-{{ index + 1 }}.jpg"
-          />
-        </van-grid-item>
-      </van-grid>
+<!--    <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>-->
 
-      <van-divider />
-      <view style="display: flex;font-size: 14px;">
-        <span style="color: cornflowerblue;">用户xxx<span
-          style="color: #333333;">的回复: 内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺</span></span>
+<!--      <view style="display: flex;font-size: 14px;">{{item.context}}</view>-->
 
-      </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-grid column-num="3" border="{{ false }}">-->
+<!--        <van-grid-item use-slot v-for=" 3 " wx:for-item="index">-->
+<!--          <image-->
+<!--            style="width: 100%; height: 90px;"-->
+<!--            src="https://img.yzcdn.cn/vant/apple-{{ index + 1 }}.jpg"-->
+<!--          />-->
+<!--        </van-grid-item>-->
+<!--      </van-grid>-->
+
+<!--      <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
-      use-slot
-      title="标题"
-      show="{{ isShowInput }}"
-      show-cancel-button
-      bind:close="onCloseInput"
-      bind:confirm="onConfirmInput"
-    >
-      <image src="https://img.yzcdn.cn/1.jpg" />
-    </van-dialog>
+<!--    <van-dialog-->
+<!--      use-slot-->
+<!--      title="标题"-->
+<!--      show="{{ isShowInput }}"-->
+<!--      show-cancel-button-->
+<!--      bind:close="onCloseInput"-->
+<!--      bind:confirm="onConfirmInput"-->
+<!--    >-->
+<!--      <image src="https://img.yzcdn.cn/1.jpg" />-->
+<!--    </van-dialog>-->
 
-    <div style="margin-top: 100px;" />
+<!--    <div style="margin-top: 100px;" />-->
   </div>
 </template>
 
 <script>
 import wepy from '@wepy/core'
 import store from '@/store'
-import { mapActions } from '@wepy/x'
+import { mapActions, mapState } from '@wepy/x'
 
 wepy.component({
   store,
@@ -76,7 +79,11 @@ wepy.component({
 
   },
 
-  computed: {},
+  computed: {
+    ...mapState({
+      'imageDefine': state => state.imageDefine
+    })
+  },
 
   methods: {
 
diff --git a/mini-app/src/components/mall/tab/mall-my.wpy b/mini-app/src/components/mall/tab/mall-my.wpy
index 79406b06a..db0e1b87e 100644
--- a/mini-app/src/components/mall/tab/mall-my.wpy
+++ b/mini-app/src/components/mall/tab/mall-my.wpy
@@ -10,7 +10,7 @@
 }
 
 .user-info {
-  margin-top: 100px;
+  margin-top: 130px;
   margin-left: 20px;
   margin-right: 20px;
   display: flex;
@@ -67,7 +67,7 @@
   <div class="container" style="margin: 10px 10px 80px 10px;">
 
     <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">
         <span style="font-size: 18px;font-weight: bold;">{{user.userInfo.nickName}}</span>
         <span style="font-size: 12px;">{{user.mobile}}</span>
@@ -95,7 +95,7 @@
       <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_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>
         </van-grid-item>
       </van-grid>
@@ -106,7 +106,7 @@
       <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_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>
         </van-grid-item>
       </van-grid>
diff --git a/mini-app/src/store/constant/nav/my.js b/mini-app/src/store/constant/nav/my.js
index 33817ef00..d98ec22d2 100644
--- a/mini-app/src/store/constant/nav/my.js
+++ b/mini-app/src/store/constant/nav/my.js
@@ -5,32 +5,32 @@ import { orderDetailListPage, orderListPage, userAddressListPage } from './pages
 export const myMenuList1 = [
   {
     name: '全部订单',
-    icon: imgbaseUrl + 'doctor.png',
+    icon: imgbaseUrl + '/my/order_1.png',
     path: orderListPage
   },
   {
     name: '待付款',
-    icon: imgbaseUrl + 'doctor.png',
+    icon: imgbaseUrl + '/my/order_2.png',
     path: orderListPage + '?orderStatus=1'
   }, {
     name: '待收货',
-    icon: imgbaseUrl + 'doctor.png',
+    icon: imgbaseUrl + '/my/order_3.png',
     path: orderListPage + '?orderStatus=2'
   }
 ]
 export const myMenuList2 = [
   {
     name: '地址管理',
-    icon: imgbaseUrl + 'doctor.png',
+    icon: imgbaseUrl + '/my/tool_1.png',
     path: userAddressListPage
   },
   {
     name: '退款管理',
-    icon: imgbaseUrl + 'doctor.png',
+    icon: imgbaseUrl + '/my/tool_2.png',
     path: orderDetailListPage
   }, {
     name: '优惠券',
-    icon: imgbaseUrl + 'doctor.png',
+    icon: imgbaseUrl + '/my/tool_3.png',
     path: ''
   }
 ]
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index ea2ff2ec9..ef33b4fb9 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -13,9 +13,9 @@ spring:
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -43,8 +43,8 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
+                login-username:
+                login-password:
             filter:
                 stat:
                     enabled: true
@@ -74,4 +74,7 @@ spring:
                 # 连接池的最大数据库连接数
                 max-active: 8
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                max-wait: -1ms
\ No newline at end of file
+                max-wait: -1ms
+
+wxmini:
+    notifyUrl: http://41.liyiren.me:8696/winery/order/pay/payNotify
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 7a3a855d0..9d5b24ab3 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -74,4 +74,7 @@ spring:
                 # 连接池的最大数据库连接数
                 max-active: 8
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                max-wait: -1ms
\ No newline at end of file
+                max-wait: -1ms
+
+wxmini:
+    notifyUrl: https://mall.xiao4r.com/api/winery/order/pay/payNotify
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 66ca0c84b..5b9d5d01b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -192,20 +192,7 @@ xss:
   # 匹配链接
   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存储配置
 tencent-cos:
@@ -214,3 +201,19 @@ tencent-cos:
   secretId: AKIDovztW8x0DpQnunSw2uXUDhw3IH0fQC75
   secretKey: rCH8tOfjX5XjegYBXfkZWc2E75nJq9Dx
   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
\ No newline at end of file
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index 9365fed54..d7391a9fb 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -3,4 +3,4 @@ ENV = 'production'
 
 # 若依管理系统/生产环境
 # VUE_APP_BASE_API = 'https://mall.xiao4r.com/api'
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/api'