From 9434605b2a844d3efa511415b15a43c44f21755b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Apr 2021 19:41:28 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/templates/views/common/login.html | 6 ++++--
zq-erp/src/main/resources/templates/views/admin/index.html | 4 ++--
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml | 2 +-
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html | 15 ++++++++++-----
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 8 ++++----
zq-erp/src/main/resources/config/application.properties | 4 ++++
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/index.html | 2 +-
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html | 4 ++--
8 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index 772d7de..9668a14 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -13,6 +13,10 @@
#spring.datasource.url=jdbc:mysql://124.70.222.34/xc_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+spring.datasource.username=hive
+spring.datasource.password=hive123!@#
+spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.initialSize=3
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml
index 3c34532..3c85b34 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml
@@ -318,7 +318,7 @@
shop_product_comment c
LEFT JOIN shop_product p ON c.product_id = p.id
LEFT JOIN shop_order o ON c.order_id = o.id
- LEFT JOIN sys_vip_info b ON c.user_id = b.id
+ LEFT JOIN sys_vip_info b ON c.user_id = b.openid
<where>
<include refid="where_sql"></include>
</where>
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
index ea543fc..d1658b5 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
@@ -56,7 +56,7 @@
<el-row>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
+ <img src="imageUrlqd" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">每日签到</span>
<div class="bottom clearfix">
@@ -67,7 +67,7 @@
</el-col>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
+ <img src="imageUrlpt" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">拼团</span>
<div class="bottom clearfix">
@@ -78,7 +78,7 @@
</el-col>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
+ <img src="imageUrlms" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">秒杀</span>
<div class="bottom clearfix">
@@ -89,7 +89,7 @@
</el-col>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
+ <img src="imageUrlsl" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">沙龙</span>
<div class="bottom clearfix">
@@ -115,7 +115,12 @@
<script>
var app = new Vue({
el: '#app',
- data: {},
+ data: {
+ imageUrlqd: basePath + "/image/meiriqiandao.png",
+ imageUrlms: basePath + "/image/jisumiaosha.png",
+ imageUrlpt: basePath + "/image/tiantianpingtuan.png",
+ imageUrlsl: basePath + "/image/shalonghuodong.png",
+ },
created: function () {
},
methods: {
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
index 6f635b1..eba3a4c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
@@ -616,8 +616,8 @@
//标题图片
imageUrlTitle: '',
- imageUrlHead: '',
- imageUrlButton: '',
+ imageUrlHead: basePath + "/image/signHead.png",
+ imageUrlButton: basePath + "/image/signButton.png",
imageUrlState: '',
//字体颜色
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/index.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/index.html
index a33c214..05ace41 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/index.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/index.html
@@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
<meta http-equiv="Cache-Control" content="no-siteapp" />
-<title>HIVE蜜米管理系统</title>
+<title>讯聪管理系统</title>
<link rel="shortcut icon" href="${path }/resource/images/mm.ico">
<!--[if lt IE 8]>
<meta http-equiv="refresh" content="0;ie.html" />
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index 0bee811..63f1f78 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -118,8 +118,8 @@
}
</style>
</head>
-<body>
-<div class="ibox-content" id="app" v-cloak>
+<body style="overflow: hidden">
+<div id="app" v-cloak>
<el-row>
@@ -359,7 +359,7 @@
</el-table>
</el-row>
- <el-row class="mt-20 vertical">
+ <el-row class=" vertical">
<el-col :span="10" class="money-box">
<div>
<ul>
@@ -660,7 +660,7 @@
shopInfo: {},
- tableHeight: 500,
+ tableHeight: 'calc(100vh - 300px)',
/*****搜索表格数据*********/
//搜索关键词
diff --git a/zq-erp/src/main/resources/templates/views/admin/index.html b/zq-erp/src/main/resources/templates/views/admin/index.html
index 2e93ffd..f3bb64a 100644
--- a/zq-erp/src/main/resources/templates/views/admin/index.html
+++ b/zq-erp/src/main/resources/templates/views/admin/index.html
@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
<meta http-equiv="Cache-Control" content="no-siteapp"/>
- <title>HIVE管理系统</title>
+ <title>讯聪管理系统</title>
<!-- 本框架基本脚本和样式 -->
<link rel="stylesheet" type="text/css" th:href="@{/plugin/layer/skin/layer.css}">
<script type="text/javascript"
@@ -37,7 +37,7 @@
<a id="dLabel" data-toggle="dropdown" class="dropdown-toggle" href="#" aria-haspopup="true" aria-expanded="true">
<span class="clear" style="height: auto;">
<span class="block m-t-xs">
- <strong class="font-bold">HIVE</strong>
+ <strong class="font-bold">讯聪管理系统</strong>
</span>
</span>
</a>
diff --git a/zq-erp/src/main/resources/templates/views/common/login.html b/zq-erp/src/main/resources/templates/views/common/login.html
index 6750c36..3ae470b 100644
--- a/zq-erp/src/main/resources/templates/views/common/login.html
+++ b/zq-erp/src/main/resources/templates/views/common/login.html
@@ -37,7 +37,7 @@
.download-bar a:hover {
text-decoration: underline;
- color: #fff;
+ color: #4968bd;
}
</style>
<script>
@@ -271,7 +271,9 @@
href="https://pubstorage-bucket.oss-cn-shenzhen.aliyuncs.com/tools/xp/49.0.2623.112_chrome_installer.exe "
target="_blank">谷歌浏览器（推荐）</a><span>|</span><strong>打印控件：</strong><a
href="https://pubstorage-bucket.oss-cn-shenzhen.aliyuncs.com/tools/CLodop_Setup_for_Win32NT_https_3.056Extend.exe"
- target="_blank">下载控件</a><span>|</span>
+ target="_blank">下载控件</a><span>|</span><strong>APP：</strong><a
+ href="http://testfile.hive.jyymatrix.cc/mobile/download.html"
+ target="_blank">下载APP客户端</a>
</p>
</div>
</div>
--
Gitblit v1.9.1