图片更新

src/main/vue/src/pagesPre/ChatContent.vue

@@ -302,6 +302,9 @@ export default {
 
         },
         send() {
+            if(!this.textarea3){
+                return
+            }
 
 
             var customer = ''

src/main/vue/src/pagesPre/LogoFoot.vue

@@ -4,6 +4,9 @@
             <div class="Foot">
                 <div class="foot-top">
                     <ul class='short-enter'>
+                         <li>
+                            <router-link :to='{name:"index"}'>首页</router-link>
+                        </li>
                         <li v-for="(item,index) in serviceType">
                             <router-link :to='{name:"business",query:{id:(index+1)}}' class="service-val">{{item.shortName}}</router-link>
                         </li>

src/main/vue/src/pagesPre/LogoHead.vue

@@ -29,6 +29,10 @@ export default {
         if (this.$route.name == 'login') {
             this.isLogin = true
             this.title = ''
+        } else if (this.$route.query.title) {
+            this.isLogin = false
+            this.title = this.$route.query.title
+            document.title = this.$route.query.title
         }
         else {
             this.isLogin = false
@@ -40,6 +44,10 @@ export default {
             if (this.$route.name == 'login') {
                 this.isLogin = true
                 this.title = ''
+            } else if (this.$route.query.title) {
+                this.isLogin = false
+                this.title = this.$route.query.title
+                document.title = this.$route.query.title
             }
             else {
                 this.isLogin = false

src/main/vue/src/pagesPre/Register.vue

@@ -343,7 +343,7 @@ export default {
                         companyName: this.formData1.companyName,
                         companyType: this.formData1.companyType,
                         contactPhone: this.formData1.contactPhone,
-                        companyType: 'Y'
+                        companyFlag: 'Y'
 
                     }
                 }).then(res => {

src/main/vue/src/pagesPre/Search.vue

@@ -8,7 +8,7 @@
 
         <div class="content">
             <div class="content-left">
-                <div class="goodsList" v-if="goodsList.length>0">
+                <div class="goodsList" v-if="!isNothing">
                     <goods-large :info='item' v-for="item in goodsList" style="margin:0 0 20px;"></goods-large>
                 </div>
                 <div v-else class="nothing">
@@ -75,7 +75,8 @@ export default {
             creditOrder: '',
             responseOrder: '',
             reworkOrder: '',
-            searchKey: ''
+            searchKey: '',
+            isNothing:false
         }
     },
     computed: {
@@ -198,6 +199,7 @@ export default {
             })
             this.flag = true
             this.currentPage = 0
+            this.isNothing=false
             this.getInfo()
         },
         getInfo() {
@@ -233,6 +235,12 @@ export default {
                     if (res.data.page.currentPage < res.data.page.totalPage) {
                         this.flag = true
                     }
+                    if(this.goodsList.length==0){
+                        this.isNothing=true
+                    }
+                    else{
+                        this.isNothing=false
+                    }
                 }
             }).catch(e => {
                 console.log(e)

src/main/vue/src/pagesPre/Shop.vue

@@ -44,7 +44,8 @@
                 </div>
             </div>
 
-            <img src="../assetsPre/levelA.png" alt="" class="level">
+            <!-- <img src="../assetsPre/levelA.png" alt="" class="level"> -->
+            <div class="level" :style="{backgroundImage:'url('+require('../assetsPre/startLogo.png')+')'}">{{shopInfo.credit}}</div>
         </div>
 
         <div class="goodsList" id='goodsList'>
@@ -136,11 +137,11 @@ export default {
             str += this.shopInfo.storeName + ',' + this.$route.name + '_;'
             return str
         },
-        storeFlag(){
-            var result=false
-            if(this.userInfo){
-                if(this.userInfo.storeFlag=='N'){
-                    result=true
+        storeFlag() {
+            var result = false
+            if (this.userInfo) {
+                if (this.userInfo.storeFlag == 'N') {
+                    result = true
                 }
             }
             return result
@@ -299,6 +300,7 @@ export default {
                     onShelf: 'Y',
                     useFlag: 'Y',
                     currentPage: this.orderCurrent,
+                    pageNumber: 8
                 }
             }).then(res => {
                 if (res.success) {
@@ -318,6 +320,7 @@ export default {
                     onShelf: 'Y',
                     useFlag: 'Y',
                     currentPage: this.productCurrent,
+                    pageNumber: 8
                 }
             }).then(res => {
                 if (res.success) {
@@ -349,8 +352,8 @@ export default {
             })
 
         },
-        chat(){
-            this.$emit("startChat",this.$route.query.id)
+        chat() {
+            this.$emit("startChat", this.$route.query.id)
         }
     },
     components: {
@@ -382,8 +385,19 @@ export default {
     .level {
         display: inline-block;
         vertical-align: top;
-        width: 58.5px;
+        // width: 58.5px;
+        // height: 30px;
+        width: 50px;
         height: 30px;
+
+        background-position: center center;
+        background-size: cover;
+        color: #fff;
+        font-size: 18px;
+        font-weight: bold;
+        line-height: 30px;
+        padding-right: 8.5px;
+        text-align: right;
     }
 
     .goodsImg {

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

@@ -283,7 +283,9 @@ export default {
 
         },
         send() {
-
+            if (!this.textarea3) {
+                return
+            }
             this.$IM.sendMessage({
                 target: this.myStoreInfo.id,
                 content: {

src/main/vue/src/pagesPre/UserSafe.vue

@@ -25,7 +25,7 @@
                     <td>账户密码</td>
                     <td>********</td>
                     <td>
-                        <el-button type="text">修改</el-button>
+                        <el-button type="text" @click="goNext('backPassword')">修改</el-button>
                     </td>
                 </tr>
             </table>
@@ -205,6 +205,14 @@ export default {
                     this.$message.warning('失败')
                 }
             });
+        },
+        goNext(str){
+            this.$router.push({
+                name:'backPassword',
+                query:{
+                    title:'修改密码'
+                }
+            })
         }
 
     },

src/main/vue/src/pagesPre/UserShop.vue

@@ -11,13 +11,14 @@
                     </div>
                 </div>
             </div>
-            <router-link :to="{name:'userSet',query:{activeName:'second'}}" class="top-item" style="width:15%">
-                账户余额
-            </router-link>
-            <router-link :to="{name:'shopOrder'}" class="top-item" style="width:15%">
+            <div class="top-item" style="width:15%">
+                <div>账户余额</div>
+                <div style="color:rgb(253, 149, 1);font-size:16px;margin-top:3px;font-weight:bold;">{{userInfo.moneyCoin}}</div>
+            </div>
+            <router-link :to="{name:'shopOrder'}" class="top-item" style="width:15%;line-height:45px;">
                 店铺订单
             </router-link>
-            <div class="top-item" style="width:38%">
+            <div class="top-item" style="width:38%;line-height:45px;">
                 存储空间
                 <div class="line">
                     <div class="use" :style="{width:useWidth+'%'}">
@@ -52,21 +53,21 @@ export default {
     data() {
         return {
             orderList: [],
-            isUseSize:0
+            isUseSize: 0
         }
     },
     computed: {
         ...mapState(['userInfo', 'myStoreInfo']),
-        canUse(){
-            var num=this.myStoreInfo.memorySpace/1024
-            num=num-parseFloat(this.isUseSize)
+        canUse() {
+            var num = this.myStoreInfo.memorySpace / 1024
+            num = num - parseFloat(this.isUseSize)
 
             return num.toFixed(0)
         },
-        useWidth(){
-            var num=0
-            num=parseFloat(this.isUseSize)/parseFloat(this.myStoreInfo.memorySpace/1024)
-            return (num*100).toFixed(0)
+        useWidth() {
+            var num = 0
+            num = parseFloat(this.isUseSize) / parseFloat(this.myStoreInfo.memorySpace / 1024)
+            return (num * 100).toFixed(0)
         }
     },
     mounted() {
@@ -91,11 +92,11 @@ export default {
         this.$http.get({
             url: '/orderImage/getMemorySize',
             data: {
-              storeId: this.userInfo.storeInfo.id
+                storeId: this.userInfo.storeInfo.id
             }
         }).then(res => {
             if (res.success) {
-                this.isUseSize=(res.data.totalSize/1024).toFixed(2)
+                this.isUseSize = (res.data.totalSize / 1024).toFixed(2)
             }
         }).catch(e => {
             console.log(e)
@@ -108,15 +109,15 @@ export default {
             this.$http.get({
                 url: '/userOrder/getOne',
                 data: {
-                    id:id
+                    id: id
                 }
             }).then(res => {
                 if (res.success) {
-                   this.orderList.forEach((item,index)=>{
-                       if(item.id==id){
-                           this.$set(this.orderList,index,res.data)
-                       }
-                   })
+                    this.orderList.forEach((item, index) => {
+                        if (item.id == id) {
+                            this.$set(this.orderList, index, res.data)
+                        }
+                    })
                 }
             }).catch(e => {
                 console.log(e)
@@ -207,6 +208,7 @@ export default {
             text-align: left;
             margin: 0 10px;
             position: relative;
+            line-height: 16px;
 
             .use {
                 width: 180px;
@@ -219,7 +221,7 @@ export default {
                     color: #fff;
                     float: left;
                     margin-left: 10px;
-                    text-shadow: #666 0.1em 0.1em 0.2em
+                    text-shadow: #666 0.1em 0.1em 0.2em;
                 }
             }
             span {

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.c7222d3cf676be5f0988.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/admin.3725b6b904015686c98e.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.01ae1664c9c2c87cf19c.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/admin.3725b6b904015686c98e.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.e6432e940b0d09f1626121b772580d03.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.c7222d3cf676be5f0988.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/index.8a78afcdbecba53ffa04.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.25d509a11c6fb3d133d1c240597703c0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.01ae1664c9c2c87cf19c.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/index.b346cb207392f75cd89e.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;