供应商

src/main/resources/static/css/supplier-center/order/settlement.css

@@ -0,0 +1,26 @@
+ @media screen and (min-width:768px) {
+   .crumbs{color: #22272e;font-size: 16px;}
+   .head-top>form{overflow: hidden;background: #fff;padding:20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
+   form>div {float: left; height: 40px;font-size: 12px;color: #627386;line-height: 40px;margin-right: 15px}
+   .head-top input[type="text"]{width: 200px;height: 36px;line-height: 36px;color: #9aa5b5;background-color: #ffffff;
+	border-radius: 2px;padding-left: 10px;border: solid 1px #b8bfca;}
+	input::placeholder{color: #9aa5b5;}
+   .state {width: 168px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;
+    color: #627386; cursor: pointer;}
+   #newBtn{float: right;margin: 0}
+   .query-btn{ width: 90px; height: 36px; background-color: #e15616;border-radius: 2px;text-align: center;color: #fff;line-height: 36px;cursor: pointer}
+   .main-content{padding: 0 20px 30px 20px;background: #fff; margin-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
+   .main-title{height: 55px;line-height: 55px;border-bottom: solid 1px #e2e7ef;}
+   .main-title li{list-style: none;display: inline-block;width: 10%; text-align: center}
+   .main-title li.samewidth{width: 15%;}
+   .main-title li:nth-child(4){width: 20%}
+   .mentlist ul li{list-style: none;display: inline-block;font-size: 12px;text-align: center;width: 10%;vertical-align: middle; line-height: 20px;color: #22272e;}
+   .mentlist ul{padding: 10px 0;margin-bottom: 30px}
+   .mentlist li.samewidth{width: 15%;}
+   .mentlist li:nth-child(4){width: 20%;vertical-align: middle; word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;
+    -webkit-line-clamp: 2; -webkit-box-orient: vertical;}
+    .samewidth a{text-decoration: underline;color: #1890f9;}
+    .status-red{color: #f94b4b;}
+    .status-blue{color: #1890f9;}
+    .status-yellow{color: #f9a94b;}
+ }

src/main/resources/static/css/supplier-center/setting/information.css

@@ -0,0 +1,14 @@
+@media screen and (min-width:768px){
+   .crumbs{color: #22272e;font-size: 16px;}
+   .head-wrap{background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+   .head-top{height: 60px;line-height: 60px;color: #9aa5b5;margin: auto;width: fit-content}
+   .head-top div{display: inline-block;cursor: pointer}
+   .head-top div:nth-child(2){margin: 0 57px;}
+   .header-tabs .line{width: 20px; height: 20px;line-height: 20px;display: inline-block;background: #9aa5b5; border-radius: 50%; color: #fff;font-size: 10px;
+    text-align: center;position: relative;top: 0px;right: 5px}
+   .header-tabs.current{color: #e15616}
+   .header-tabs .line.linestyle{color: #fff;background: #e15616}
+   .container{background: #fff}
+   .container .forget-form{width: 500px; margin: 0 auto;padding: 20px 0}
+   .formLine select:nth-child(2){margin: 0 14px}
+}

src/main/resources/static/css/supplier-center/setting/password.css

@@ -15,7 +15,8 @@ li{list-style:none}
     .right-header .header-tabs{width: 168px;height: 38px;background-color: #f0f3f7;border-radius: 2px 0px 0px 2px;;line-height: 38px;font-size: 14px;text-align: center;color: #627386;float: left;cursor: pointer;}
     .right-header .header-tabs.current{background-color: #e15616;color: #FFFFFF;}
     .container{width: 100%;min-height:485px;box-sizing: border-box;padding: 16px 236px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-
+    .formLine p{color: #627386}
+    input::placeholder{color: #9aa5b5;}
 }
 
 /**

src/main/resources/static/css/supplier-center/setting/phone.css

@@ -12,10 +12,12 @@ li{list-style:none}
     .signAccount .title{height:42px;line-height:42px;font-size:16px;color:#22272e;text-align:left;background-color: #F5F5F5;}
     .forget-form{width:498px;margin:0 auto;padding: 20px 0;}
     .header{width: 100%;height: 76px;box-sizing: border-box;padding: 20px 0;background-color: #FFFFFF;}
-    .header .header-p{width: 100%;height: 36px;background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);line-height: 36px;font-size: 14px;color: #e15616;text-align: center;}
+    .header .header-p{width: 100%;height: 36px;background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);line-height: 36px;font-size: 14px;color:#e15616;text-align: center;}
     .container{width: 100%;min-height:510px;box-sizing: border-box;padding:0 236px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-    .container .title{width: 100%;line-height: 36px;font-size: 14px;color: #22272E;text-align: center;}
+    .container .title{width: 100%;line-height: 36px;font-size: 14px;color: #627386;text-align: center;}
     .container .title span{color: #f94b4b;}
+    input::placeholder{color: #9aa5b5;}
+    .formLine p {color: #627386;}
 
 }
 

src/main/resources/static/js/common/serviceapi/supplier.service.js

@@ -187,5 +187,30 @@ var SupplierApi = {
                 callback(res);
             });
         },
+        dressUpList : function(params,callback) {//装扮主页列表
+            Http.AjaxService({ url:'/supplier/dressUp', type:'get', data:params, json:true})
+            .then(function(res){
+                callback(res);
+            });
+        },
+         ShopBanner : function(params,callback) {//装扮主页修改与添加
+            Http.AjaxService({ url:'/supplier/saveShopBanner', type:'POST', data:params, json:false})
+            .then(function(res){
+                callback(res);
+            });
+        },
+        deleteShopBanner : function(params,callback) {//装扮主页删除广告 Integer shopBannerId
+            Http.AjaxService({ url:'/supplier/deleteShopBanner', type:'POST', data:params, json:false})
+            .then(function(res){
+                callback(res);
+            });
+        },
+        settlementList : function(params,callback) {//结算管理列表
+            Http.AjaxService({ url:'/supplier/settlementList', type:'get', data:params, json:true})
+            .then(function(res){
+                callback(res);
+            });
+        },
+
 
 };

src/main/resources/static/js/flea-market/form.js

@@ -330,8 +330,7 @@ var fleaMarketForm = new Vue({
                _this.vShow_secondBj = true;
                _this.playid= res.data;
              }else{
-                 // layer.msg(res.msg, {icon: 7});
-                 CAIMEI.Alert(res.msg)
+                 CAIMEI.Alert(res.msg, '确定', false);
                  _this.secondBj = false;
                  return
              }
@@ -386,7 +385,7 @@ var fleaMarketForm = new Vue({
                     _this.secondParams.townId = event.target.value;
                     console.log(_this.secondParams.townId)
                 }else{
-                    layer.msg(response.msg, {icon: 7});
+                    CAIMEI.Alert(response.msg, '确定', false);
                 }
             })
         },
@@ -410,7 +409,7 @@ var fleaMarketForm = new Vue({
             console.log(response)
                 _this.provinceArray = response.data
             }else{
-                layer.msg(response.msg, {icon: 7});
+                CAIMEI.Alert(response.msg, '确定', false);
             }
         })
     },

src/main/resources/static/js/supplier-center/order/settlement.js

@@ -0,0 +1,81 @@
+jqMultipleShow("click", ".navList", ".tab", ".con");
+var settlement = new Vue({
+    el:'#settlement',
+    data:{
+        params:{
+            shopID:'',
+            pageNum: 1,
+            pageSize: 10,
+            shopOrderNo:'',
+            userName: '',
+            payStatus:'',
+        },
+        list:[],
+        pageInput: '1',
+        listRecord: 0,
+        },
+     computed: {
+        pageTotal: function () {
+            var total = Math.ceil(this.listRecord / this.params.pageSize);
+            return total > 0 ? total : 1;
+        },
+        showPageBtn: function () {
+            var total = Math.ceil(this.listRecord / this.params.pageSize);
+            total = total > 0 ? total : 1;
+            var index = this.params.pageNum, arr = [];
+            if (total <= 6) {
+                for (var i = 1; i <= total; i++) {
+                    arr.push(i);
+                }
+                return arr;
+            }
+            if (index <= 3) return [1, 2, 3, 4, 5, 0, total];
+            if (index >= total - 2) return [1, 0, total - 4, total - 3, total - 2, total - 1, total];
+            return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, total];
+        }
+    },
+    methods:{
+         toPagination: function (pageNum) {
+            if (pageNum <= this.pageTotal) {
+                this.params.pageNum = pageNum;
+                this.settlementList(this.params);
+            }
+        },
+        checkNum: function () {
+            if (this.pageInput > this.pageTotal) {
+                this.pageInput = this.pageTotal;
+            } else if (this.pageInput < 1) {
+                this.pageInput = 1;
+            }
+        },
+        settlementList:function () {
+            var _this = this;
+            SupplierApi.settlementList(_this.params,function (res) {
+                if(res.code==0){
+                    if(res.data.results.length>0){
+                        _this.list = res.data.results;
+                        _this.listRecord = res.data.totalRecord;
+                    }else {
+                        _this.results = res.data.results;
+                        _this.listRecord = res.data.totalRecord;
+                    }
+                }
+            })
+        },
+        getstatus:function () { //状态
+            var _this = this;
+             _this.params.payStatus=event.target.value;
+        },
+        serchBtn:function () {
+        console.log(this.params)
+           this.settlementList()
+        }
+    },
+    mounted:function () {
+        var _self= this;
+        if(globalUserData){
+              _self.params.shopID = globalUserData.shopId;
+            }
+        _self.settlementList()
+    }
+})

src/main/resources/static/js/supplier-center/setting/information.js

@@ -0,0 +1,24 @@
+jqMultipleShow("click", ".navList", ".tab", ".con");
+ var information = new Vue({
+    el:'#information',
+    data:{
+         tabCurrentIndex:1,
+         provinceArray:[],
+    },
+    methods:{
+        checkedFn:function (index) {
+            this.tabCurrentIndex = index;
+        }
+    },
+    mounted:function () {
+    var _self=this;
+        PublicApi.GetProvince({},function(response){ //省份
+            if(response.code == 0){
+            console.log(response)
+                _self.provinceArray = response.data
+            }else{
+                CAIMEI.Alert(response.msg, '确定', false);
+            }
+        })
+    }
+ })

src/main/resources/static/js/supplier-center/shop/decoration.js

@@ -7,19 +7,15 @@ var decoration = new Vue({
         logoShow:false,
         formData:new FormData(),
         params:{
+            shopID:'',
             title:'',
             link:'',
             info:'',
             image:'',
         },
+        shopBannerId:'',
         name:'',
-        list:[
-            {title:'华熙生物润百颜液体华熙生物润',link:'功效性产品/其他-其他',info:'功效性产品/其他-其他',image:'https://img-b.caimei365.com/group1/M00/02/FC/Cmgy619gZQeAe8KQAAHWNoNlmYM356.jpg'},
-            {title:'华熙生物润百颜液体华熙生物润',link:'功效性产品/其他-其他',info:'功效性产品/其他-其他',image:'https://img-b.caimei365.com/group1/M00/02/FC/Cmgy619gZTqACueJAABbKjW7oaQ584.jpg'},
-            {title:'华熙生物润百颜液体华熙生物润',link:'功效性产品/其他-其他',info:'功效性产品/其他-其他',image:'https://img-b.caimei365.com/group1/M00/02/FC/Cmgy619gZUqAFJ4BAABHHJZiQ3o518.jpg'},
-            {title:'华熙生物润百颜液体华熙生物润',link:'功效性产品/其他-其他',info:'功效性产品/其他-其他',image:'https://img-b.caimei365.com/group1/M00/02/FC/Cmgy619gZQeAe8KQAAHWNoNlmYM356.jpg'},
-            {title:'华熙生物润百颜液体华熙生物润',link:'功效性产品/其他-其他',info:'功效性产品/其他-其他',image:'https://img-b.caimei365.com/group1/M00/02/FC/Cmgy619gZQeAe8KQAAHWNoNlmYM356.jpg'},
-        ]
+        list:[],
     },
     methods:{
           uploadlogo:function () { //上传图片
@@ -36,14 +32,34 @@ var decoration = new Vue({
         },
         addpictures:function () {
             var _this = this;
-            _this.name = '添加主页广告图';
-            _this.bgflag = true;
-            _this.iconflag=true;
-            _this.logoShow =false;
+            if(_this.list.length==4){
+                 CAIMEI.dialog('主页广告图的上限是4张图');
+            }else {
+                _this.name = '添加主页广告图';
+                _this.bgflag = true;
+                _this.iconflag=true;
+                _this.logoShow =false;
+            }
+        },
+        submit:function(){//提交
+            var _this = this;
+            if(_this.name.indexOf('编辑') > -1) {
+                _this.params.shopBannerID = _this.shopBannerId
+            }
+            if(_this.params.image==''){
+                CAIMEI.dialog('请上传广告图片')
+            }else {
+            console.log(_this.params)
+                SupplierApi.ShopBanner(_this.params,function (res) {
+                   CAIMEI.dialog('提交成功');
+                    location.reload()
+                })
+            }
         },
         editpictures:function(item){
              var _this = this;
             _this.name = '编辑主页广告图';
+            _this.shopBannerId = item.shopBannerID;
             _this.bgflag = true;
             _this.params.title = item.title;
             _this.params.link = item.link;
@@ -59,8 +75,16 @@ var decoration = new Vue({
              }
         },
         deletepictures:function(item){
+            var _this = this;
+            var shopBannerId = item.shopBannerID;
+            console.log(shopBannerId)
             CAIMEI.Modal('您确定要删除么？','取消','确定',function () {
-
+                   SupplierApi.deleteShopBanner({shopBannerId:shopBannerId},function (res) {
+                    if(res.code==0){
+                        CAIMEI.dialog('删除成功');
+                        location.reload()
+                    }
+                   })
             })
         },
         close:function () {
@@ -74,6 +98,19 @@ var decoration = new Vue({
 
     },
     mounted:function () {
+        var _self = this;
+         if(globalUserData){
+              _self.params.shopID = globalUserData.shopId;
+
+            }
+        SupplierApi.dressUpList({shopId:_self.params.shopID},function (res) {
+            if(res.code==0){
+                console.log(res)
+                if(res.data.length>0){
+                _self.list =res.data;
+                }
+            }
+        })
 
     }
 })

src/main/resources/static/js/supplier-center/shop/goods.js

@@ -117,7 +117,7 @@ var Brandgoods =new Vue({
           _this.title = '编辑新品牌';
          _this.brandobj.name = item.name;
          _this.brandobj.description=item.description;
-         if(item.logo !=''){
+         if(item.logo !=''&& item.logo!=null){
             _this.brandobj.logo=item.logo;
             _this.logoShow = true;
             _this.iconflag = false;

src/main/resources/templates/supplier-center/order/detail.html

@@ -87,14 +87,14 @@
                                   </p>
                           </div>
                           <div class="order-item">
-                                    <p>商品金额：<span class="red">￥{{order.productAmount.toFixed(2)}}</span> </p>
-                                    <p>结算商品金额：<span class="red">￥{{order.shopProductAmount.toFixed(2)}}</span> </p>
-                                    <p>结算税费：<span class="red">￥{{order.shopTaxFee.toFixed(2)}}</span> </p>
-                                    <p>结算运费：<span class="red">￥{{order.shopPostFee.toFixed(2)}}</span> </p>
+                                    <p>商品金额：<span class="red">￥{{order.productAmount?order.productAmount.toFixed(2):'0.00'}}</span> </p>
+                                    <p>结算商品金额：<span class="red">￥{{order.shopProductAmount?order.shopProductAmount.toFixed(2):'0.00'}}</span> </p>
+                                    <p>结算税费：<span class="red">￥{{order.shopTaxFee?order.shopTaxFee.toFixed(2):'0.00'}}</span> </p>
+                                    <p>结算运费：<span class="red">￥{{order.shopPostFee?order.shopPostFee.toFixed(2):'0.00'}}</span> </p>
                             </div>
                             <div class="order-item">
-                                    <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount.toFixed(2)}}</span> </p>
-                                    <p>已结算金额：<span class="red">￥{{order.payedShopAmount.toFixed(2)}}</span> </p>
+                                    <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount?order.shouldPayShopAmount.toFixed(2):'0.00'}}</span> </p>
+                                    <p>已结算金额：<span class="red">￥{{order.payedShopAmount?order.payedShopAmount.toFixed(2):'0.00'}}</span> </p>
                              </div>
                          </div>
                     </div>

src/main/resources/templates/supplier-center/order/settlement.html

@@ -4,19 +4,95 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/order/settlement.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div class="settlement">
+<div id="settlement">
+    <div class="navLayout" >
+         <div class="crumbs">
+            <span>我的店铺</span>
+            <span>&gt;</span>
+            <span>品牌管理</span>
+        </div>
+        <div class="wrap clear">
+             <!--左侧面包屑-->
+            <template th:replace="supplier-center/components/tableft"></template>
+            <div class="right">
+                <div class="head-top">
+                    <form action="">
+                        <div class='order-border'><span>订单编号：</span><input type="text" v-model="params.shopOrderNo"  placeholder="请输入商品货号"> </div>
+                        <div class='order-border'><span>买家名称：</span><input type="text" v-model="params.userName"  placeholder="请输入买家名称"> </div>
+                        <div>
+                            结算状态：
+                            <select name="" id="settlement-status" class="state" @change="getstatus($event)">
+                                <option value="">所有</option>
+                                <option value="1">待结算</option>
+                                <option value="2">部分结算</option>
+                                <option value="3">已结算</option>
+                            </select>
+                            </div>
+                            <div id="newBtn">
+                                <div class="query-btn" @click="serchBtn">查询</div>
+                            </div>
+                    </form>
+                </div>
+                <div class="main-content">
+                    <ul class="main-title">
+                        <li class="samewidth">订单编号</li>
+                        <li class="samewidth">下单时间</li>
+                        <li class="samewidth">买家</li>
+                        <li>商品信息</li>
+                        <li>结算状态</li>
+                        <li>总结算金额</li>
+                        <li>已结算金额</li>
+                    </ul>
+                    <div class="mentlist">
+                     <div v-for="res in list">
+                        <ul v-for="item in res.orderProductList">
+                            <li class="samewidth"><a :href="'/supplier/order/detail.html?shopOrderID='+res.shopOrderID">{{item.shopOrderNo}}</a></li>
+                            <li class="samewidth">{{res.orderTime}}</li>
+                            <li class="samewidth">{{res.name}}</li>
+                            <li>{{item.name}}</li>
+                            <li>
+                                <span v-if="res.payStatus==1||res.payStatus==null" class="status-red">待结算</span>
+                                <span v-if="res.payStatus==2" class="status-yellow">部分结算</span>
+                                <span v-if="res.payStatus==3" class="status-blue">已结算</span>
+                            </li>
+                            <li>¥ {{res.shouldPayShopAmount ?res.shouldPayShopAmount.toFixed(2) :'0.00'}}</li>
+                            <li>¥ {{res.payedShopAmount ?res.payedShopAmount.toFixed(2) :'0.00'}}</li>
+                        </ul>
+                        </div>
+                    </div>
+                </div>
 
+                 <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
+                     <div class="pageWrap clear" v-if="isPC && pageTotal>1">
+                            <a v-if="params.pageNum>1" class="prev" @click="toPagination(params.pageNum*1-1)" href="javascript:void(0);"></a>
+                            <template v-for="n in showPageBtn">
+                                <a v-if="n" :class="{'on':(n==params.pageNum)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
+                                <span v-else>···</span>
+                            </template>
+                            <a v-if="params.pageNum<pageTotal" class="next" @click="toPagination(params.pageNum*1+1)" href="javascript:void(0);"></a>
+                            <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
+                            <span>跳至</span>
+                            <input v-model="pageInput" @blur="checkNum()"/>
+                            <span>页</span>&nbsp;
+                            <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
+                     </div>
+            </div>
+        </div>
+    </div>
 </div>
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/settlement.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/supplier-center/setting/information.html

@@ -4,20 +4,80 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
-
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/setting/information.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div>
-
+<div id="information">
+    <div class="navLayout" >
+        <div class="crumbs">
+            <span>管理中心</span>
+            <span>&gt;</span>
+            <span>资料信息</span>
+        </div>
+        <div class="wrap clear">
+             <!--左侧面包屑-->
+            <template th:replace="supplier-center/components/tableft"></template>
+            <div class="right">
+                <div class="head-wrap">
+                    <div class="head-top">
+                        <div class="header-tabs" :class="{ current: tabCurrentIndex === 1 }" @click="checkedFn(1)">
+                        <span class="line" :class="{ linestyle: tabCurrentIndex === 1 }">1</span>公司基本信息</div>
+                        <div class="header-tabs" :class="{ current: tabCurrentIndex === 2 }" @click="checkedFn(2)">
+                        <span class="line" :class="{ linestyle: tabCurrentIndex === 2 }">2</span>公司经营信息</div>
+                        <div class="header-tabs" :class="{ current: tabCurrentIndex === 3 }" @click="checkedFn(3)">
+                        <span class="line" :class="{ linestyle: tabCurrentIndex === 3 }">3</span>公司资质证明</div>
+                    </div>
+                </div>
+                <div class="container clear">
+                    <div class="forget-form"  v-if="tabCurrentIndex == 1">
+                        <form>
+                            <div class="formLine" >
+                                <p><em>*</em>公司名称：</p>
+                                <input  class="massageBtn"  type="text"  placeholder="请与营业执照的注册名称保持一致"  maxlength="11" needverify>
+                            </div>
+                            <div class="formLine" >
+                                <p>公司简称：</p>
+                                <input  class="massageBtn"  type="text"  placeholder="请与营业执照的注册名称保持一致"  maxlength="11" needverify>
+                            </div>
+                            <div class="formLine" >
+                                <p><em>*</em>公司地址：</p>
+                                 <select name="provinceID" id="cProvince">
+                                     <option value="">请选择</option>
+                                     <option v-for="item in provinceArray" :value="item.provinceID">{{item.name}}</option>
+                                 </select>
+                                 <select name="cityID" id="cityID">
+                                     <option value="">请选择</option>
+                                     <option></option>
+                                 </select>
+                                 <select name="townID" id="townID">
+                                     <option value="">请选择</option>
+                                     <option></option>
+                                 </select>
+                            </div>
+                        </form>
+                    </div>
+                     <div class="forget-form"  v-if="tabCurrentIndex == 2">
+                        <form></form>
+                    </div>
+                     <div class="forget-form"  v-if="tabCurrentIndex == 3">
+                        <form></form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/setting/information.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/supplier-center/setting/password.html

@@ -6,7 +6,7 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/user-center/setting/password.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/setting/password.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->

src/main/resources/templates/supplier-center/setting/phone.html

@@ -24,10 +24,10 @@
             <template th:replace="supplier-center/components/tableft"></template>
             <div class="right">
                 <div class="header">
-                    <div class="header-p">本操作更换的是机构联系人的手机号，不是运营人员的手机号！</div>
+                    <div class="header-p">本操作更换的是公司联系人的手机号，不是运营人员的手机号！</div>
                 </div>
                 <div class="container clear">
-                    <div class="title"><span>*</span>原手机号:{{form.contractMobile2}}</div>
+                    <div class="title"><span>*</span>原手机号：{{form.contractMobile2.substring(0,3)}}***{{form.contractMobile2.substring(7,11)}}</div>
                     <form>
                         <div class="formLine code">
                             <p><em>*</em>原手机号验证码：</p>

src/main/resources/templates/supplier-center/shop/decoration.html

@@ -78,7 +78,7 @@
                             </div>
                             <div >
                                 <p class="Note">注：仅支持<span class="colorstyle">jpg、gif、jpeg、png、emp</span>，文件小于<span class="colorstyle">5M</span></p>
-                                <div class="saveBtn">保存</div>
+                                <div class="saveBtn" @click="submit" >保存</div>
                              </div>
                         </div>
 

src/main/resources/templates/supplier-center/shop/goods.html

@@ -54,7 +54,7 @@
                         <ul v-for="item in brandlist">
                             <li class="brand-name"><h3>{{item.name}}</h3></li>
                             <li class="brand-logo">
-                                <img :src="item.logo" v-if="item.logo!=''">
+                                <img :src="item.logo" v-if="item.logo!=''&&item.logo!=null">
                                 <span v-else>暂无</span>
                             </li>
                             <li class="brand-status">