9月19 前台提交

src/main/vue/src/emUI.less

@@ -431,7 +431,7 @@ a{
 }
 
 
-.imgList img{
+.imgList.productInfo img{
     width: 100%;
     display: block;
     height: auto!important;

src/main/vue/src/pagesPre/BackPassword.vue

@@ -30,10 +30,10 @@
             <template v-if="nowStep==2">
                 <el-form :model="formData" :rules="rules2" ref="form" label-width="100px" label-position="right" style="max-width: 420px;margin-top:20px;margin:auto">
                     <el-form-item prop="password" label="设置密码">
-                        <el-input type="password" name='psd' placeholder="6-11位的字母或者数字（必须包含数字字母的组合）" v-model="formData.password" maxlength="11"></el-input>
+                        <el-input type="password" name='psd' placeholder="6-20位的字母或者数字（必须包含数字字母的组合）" v-model="formData.password" maxlength="20"></el-input>
                     </el-form-item>
                     <el-form-item prop="surePassword" label="确认密码">
-                        <el-input type="password" name='surepsd' placeholder="请重复输入密码" v-model="formData.surePassword" maxlength="11"></el-input>
+                        <el-input type="password" name='surepsd' placeholder="请重复输入密码" v-model="formData.surePassword" maxlength="20"></el-input>
                     </el-form-item>
 
                     <el-form-item label="">
@@ -137,12 +137,12 @@ export default {
                     {
 
                         validator: (rule, value, callback) => {
-                            if (!value) {
+                              if (!value) {
                                 callback(new Error('请输入密码'));
-                            } else if (/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,11}$/.test(value)) {
+                            } else if (!/^.*(?=.{6,})(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*? ]).*$/.test(value)) {
                                 callback();
                             } else {
-                                callback(new Error('6-11位的字母或者数字（必须包含数字字母的组合）'));
+                                callback(new Error('6-20位的字母、数字和特殊字符（必须包含数字母、数字和特殊字符）'));
                             }
                         }, trigger: 'blur'
                     }

src/main/vue/src/pagesPre/Login.vue

@@ -136,7 +136,7 @@ export default {
                         this.loading = false;
                         if (res.success) {
                             this.$message.success('登录成功')
-                            if (this.brefName) {
+                            if (this.brefName && this.brefName != 'register' && this.brefName != 'backPassword') {
                                 history.back()
                             }
                             else {
@@ -178,7 +178,7 @@ export default {
                         this.loading = false;
                         if (res.success) {
                             this.$message.success('登录成功')
-                            if (this.brefName) {
+                            if (this.brefName && this.brefName != 'register' && this.brefName != 'backPassword') {
                                 history.back()
                             }
                             else {

src/main/vue/src/pagesPre/MemberMoney.vue

@@ -29,10 +29,13 @@
             </el-table-column>
 
             <el-table-column prop="createTime" label="日期" min-width="200" align="center">
+                <template slot-scope="scope">
+                    {{getTime(scope.row.createTime)}}
+                </template>
             </el-table-column>
 
-            <el-table-column prop="typeFlag" label="备注" min-width="100" align="center">
-            </el-table-column>
+            <!-- <el-table-column prop="typeFlag" label="备注" min-width="100" align="center">
+            </el-table-column> -->
 
         </el-table>
         <div class="pagination-wrapper" style="padding:20px 0;">
@@ -252,7 +255,7 @@ export default {
                 this.$refs.form1.validate((valid) => {
                     if (valid) {
                         data.alipay = this.formData.alipay
-                        this.submit();
+                        this.submit(data);
                     } else {
                         return false;
                     }
@@ -264,7 +267,7 @@ export default {
                         data.bankCard = this.formData.bankCard
                         data.bankName = this.formData.bankName
                         data.openName = this.formData.openName
-                        this.submit();
+                        this.submit(data);
                     } else {
                         return false;
                     }

src/main/vue/src/pagesPre/Product.vue

@@ -92,7 +92,7 @@
         <div class="goodsList">
             <el-tabs class="goodsTab" v-model="activeName">
                 <el-tab-pane label="商品详情" name="first">
-                    <div class="imgList">
+                    <div class="imgList productInfo">
                         <div v-html="shopInfo.productDetail"></div>
                         <!-- <img :src="item.image" v-for="item in shopInfo.productImageList" alt=""> -->
                     </div>

src/main/vue/src/pagesPre/SetStoreInfo.vue

@@ -38,7 +38,7 @@
         </el-form-item> -->
 
         <el-form-item prop="description" label="店铺简介">
-            <el-input v-model="formData.description" maxlength="30" style="width:320px;" :disabled="'description'==subColumn" placeholder="请输入店铺简介（30字以内）"></el-input>
+            <el-input  type="textarea" :rows="2" v-model="formData.description" maxlength="30" style="width:320px;" :disabled="'description'==subColumn" placeholder="请输入店铺简介（30字以内）"></el-input>
         </el-form-item>
         <el-form-item prop="icon" label="店铺头像">
             <single-upload-title v-model="formData.icon" :width='200' :height='125' :title="'添加头像'" :disabled="'icon'==subColumn"></single-upload-title>

src/main/vue/src/pagesPre/StoreChat.vue

@@ -2,7 +2,7 @@
     <div class="conatiner">
         <div class="content" v-if="!Customer">
             <div class="title">
-                选择登录客服
+                {{customerList.length>0?'选择登录客服':'您还没有设置客服哦！商家中心——账户设置——客服管理可以添加'}}
             </div>
             <div class="customerList">
 

src/main/vue/src/pagesPre/UserProductCon.vue

@@ -192,7 +192,7 @@ export default {
     }
 
     .nothing {
-        margin: 136px auto;
+        padding: 136px auto;
 
         img {
             width: 167px;

src/main/vue/src/routerPre/index.js

@@ -440,7 +440,7 @@ router.beforeEach((to, from, next) => {
         return;
     }
 
-    if (from.name != 'login' && from.name != 'register' && from.name != 'backPassword') {
+    if (from.name != 'login') {
         store.commit('updateBrefName', from.name)
     }
 

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.da4f73e09f989b1618ebd295c1c6c122.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.63987a9bddf8511a124d.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/admin.b12be61dbedd5d5392f6.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.da4f73e09f989b1618ebd295c1c6c122.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f5fc001b5bb69f582381.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/admin.37d06aefedc8adc9c0ca.js></script></body></html>

src/main/webapp/WEB-INF/html/index.html

@@ -5,7 +5,7 @@
             position: absolute;
             top: 0;
             left: 0;
-        }</style><link href=/static/css/index.89cbf8d7f7908ec8be99781623cda0de.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.63987a9bddf8511a124d.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/index.a4e9186ab709e5158daf.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.6d2c93cc280481c058dd146882ccf627.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f5fc001b5bb69f582381.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/index.4a2996224c7f6eeae1e8.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;

src/main/webapp/static/js/131.e7503017770b9b90edcf.js → src/main/webapp/static/js/130.fe264b814daf4aaac44d.js

@@ -1 +1 @@
-webpackJsonp([131],{V8wA:function(t,e){},izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("V8wA")},"data-v-6d20da16",null);e.default=c.exports}});
+webpackJsonp([130],{V8wA:function(t,e){},izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("V8wA")},"data-v-6d20da16",null);e.default=c.exports}});