Administrator 4 éve
szülő
commit
d0246c4179

+ 9 - 2
src/main/resources/static/css/account/login.css

@@ -36,8 +36,15 @@ footer .footTop{display:none;}
 #qrCodeWrap .model .refresh-div{width:100px;height:64px;display:block}
 #qrCodeWrap .model .refresh-div p{text-align:center;font-size:14px;line-height:20px}
 .baseHeadCenter.account .accountLogin{display:none}
-
-
+.bg{width: 100%;height: 100%;position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 99999999;font-family: inherit;overflow: hidden;background-color: #4444444f;opacity: 0}
+ .bg .bg-content{width: 338px;height: fit-content;position: absolute;top: 0;bottom: 0;right: 0;left: 0;margin: auto;z-index: 9999;background: #fff;}
+ .bg .bg-content .bg-tittle{height: 42px;line-height: 42px;font-size: 16px;background:#f8f8f8;color: #333333;padding: 0 16px;position: relative}
+ .bg-tittle .icon{width: 25px;height: 25px;position: absolute;right: 10px;top: 10px;cursor: pointer;}
+ .bg-tittle .icon:before{ width: 25px;height: 25px;background-position: -313px 0px;}
+ .bg .bg-content .text-conten{padding: 16px;}
+ .bg .bg-content .text-conten .status{color: #333333;font-size: 16px;line-height: 26px;margin-bottom: 30px}
+ .bg .bg-content .text-conten .tip-p{text-align: center;color:#e15616;font-size: 14px;line-height: 26px }
+ .bg .bg-content .text-conten div{cursor: pointer;text-align: center;background: #e15616;width: 128px;height: 32px;line-height: 32px;color: #fff;margin: auto;border-radius: 2px;margin-top: 20px}
 }
 
 /**

+ 3 - 1
src/main/resources/static/css/account/register.css

@@ -68,7 +68,8 @@ footer .footTop{display:none;}
 .purchase{font-size: 18px;width: 127px;margin: 10px auto 0;text-align: center}
 .b .purchase{color: #FF7A51}
 .tips-text{color: #999999;font-size: 14px;line-height: 20px;}
-
+.formLine p{color:#627386; }
+body.bgNO{background: none}
 }
 
 /**
@@ -142,4 +143,5 @@ footer{display:none}
 .purchase{font-size: 3.8vw;background: #fff;margin: 2.7vw auto;text-align: center}
 .b .purchase{color: #e15616}
 .tips-text{color: #999999;font-size: 3.4vw;}
+body.bgNO{background: none}
 }

+ 2 - 2
src/main/resources/static/css/product/instruement.css

@@ -64,8 +64,8 @@
     .brand{color: #9aa5b5;margin: 10px 8px;border: 1px solid #e3ebf7;display: inline-block;padding: 0 10px;border-radius: 2px}
     .item_icon{ width: 100%;height: 36px;padding: 12px 0 8px 0;}
     .item_icon img{width: 36px;height: 36px;display: block;margin: 0 auto;}
-    .productItem .price em{font-weight: normal;margin: 0;}
-    .productItem .price em.bold{font-weight: bold;margin: 0}
+    .productItem .price .price_grade{font-weight: normal;margin: 0;}
+    .productItem .price .bold{font-weight: bold;margin: 0}
     .price .right-box{margin:12px 0 0 0}
 }
 

+ 47 - 2
src/main/resources/static/js/account/login.js

@@ -24,12 +24,23 @@ var loginPage = new Vue({
             permission: '',
             token: ''
         },
-        isWeChat: false
+        isWeChat: false,
+        text:'',
+        stautsfalse:false,
+        infofalse:false,
     },
     computed: {
 
     },
     methods: {
+        hideBg:function(){
+            this.stautsfalse=false;
+        },
+        information:function(){
+            window.location.href='/supplier/information.html';
+            this.setStorages( this.userData);
+
+        },
         toQrCodeLogin: function(){//切换微信登录二维码
             var _self = this;
             var timeClock = null;
@@ -104,6 +115,24 @@ var loginPage = new Vue({
                         }
                     }else if(response.code == -4){
                         window.location.href = '/bind.html';
+                    }else if(response.code == '-3'){//审核未通过
+                        _self.text ='您的供应商账号审核未通过,原因:图片模糊,营业执照错误,审核人员在后台填写的内容';
+                        _self.stautsfalse = true;
+                        _self.infofalse = true;
+                        _self.userData = {
+                            userId: response.data.userID,
+                            spId: response.data.serviceProviderID,
+                            clubId: response.data.clubID,
+                            shopId: response.data.shopID,
+                            userIdentity: response.data.userIdentity,
+                            permission: response.data.userPermission,
+                            token: response.data.token
+                        };
+                    }else if(response.code == '-2'){
+                        _self.stautsfalse = true;
+                        _self.text ='您的供应商账号正在加速审核中,审核通过后即可登录';
+                    }else{
+                         CAIMEI.Alert(response.msg,'确定',false);
                     }
                 }
             });
@@ -177,7 +206,23 @@ var loginPage = new Vue({
                         } else {
                             location.href="/index.html";
                         }
-                    } else {// 登录失败
+                    } else if(response.code == '-3'){//审核未通过
+                        _self.text ='您的供应商账号审核未通过,原因:图片模糊,营业执照错误,审核人员在后台填写的内容';
+                        _self.stautsfalse = true;
+                        _self.infofalse = true;
+                        _self.userData = {
+                            userId: response.data.userID,
+                            spId: response.data.serviceProviderID,
+                            clubId: response.data.clubID,
+                            shopId: response.data.shopID,
+                            userIdentity: response.data.userIdentity,
+                            permission: response.data.userPermission,
+                            token: response.data.token
+                        };
+                    }else if(response.code == '-2'){
+                        _self.stautsfalse = true;
+                        _self.text ='您的供应商账号正在加速审核中,审核通过后即可登录';
+                    }else {// 登录失败
                         CAIMEI.Alert(response.msg,'确定',false);
                     }
                 });

+ 292 - 0
src/main/resources/static/js/account/supplier-information.js

@@ -0,0 +1,292 @@
+var registerPage = new Vue({
+    el: "#registerPage",
+    data: {
+
+        loginLoading:false,
+        showSupplierConfirm:true,
+        supplierUser: {
+            userID:0,
+            shopID:0,
+            linkMan:'',
+            email:'',
+            name:'',
+            sname:'',
+            socialCreditCode:'',
+            businessLicenseImage:'',
+            provinceID :'',
+            cityID : '',
+            townID : '',
+            address:'',
+            firstShopType:'',
+            secondShopType: '',
+            mainpro:'',
+            isAgreed:1,
+        },
+        isAgree:true,
+        isShowAgree:false,
+        mentuzCampNullList:[
+            {value:'1',name:'产品'},
+            {value:'2',name:'仪器'},
+            {value:'3',name:'服务'}
+        ],
+        shopMainPros: [],
+        formData:new FormData(),
+        mainProEdit: '',
+        ProvinceList:[],
+        cityArray:[],
+        townArray:[],
+        addressfrom: {
+            province: '',//省id
+            city: '',
+            town: ''
+        },
+        rule:{
+            name: '^[a-zA-Z\\u4e00-\\u9fa5]{2,}$',
+            phone: '^\\d{6,12}$',
+            code: '^\\d{6}$',
+            license: '^[a-zA-Z0-9_]{18}$',
+            email: '^(([^<>()\\[\\]\\\\.,;:\\s@&quot;]+(\\.[^<>()\\[\\]\\\\.,;:\\s@&quot;]+)*)|(&quot;.+&quot;))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$',
+            password: "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$"
+        },
+        infoData:{},
+        flagshow:false,
+    },
+    computed: {
+
+    },
+    methods: {
+        shopInfo:function(){
+            var _this = this;
+            SupplierApi.shopInfo({userId:_this.supplierUser.userId},function(res){
+                if(res.code==0){
+                    var shop = res.data.shop;
+                    var user = res.data.user;
+                    _this.supplierUser.name = shop.name;
+                    _this.supplierUser.linkMan = shop.linkMan;
+                    _this.supplierUser.email = user.email;
+                    _this.supplierUser.sname = shop.sname;
+                    _this.supplierUser.provinceID = shop.provinceID;
+                    _this.supplierUser.cityID = shop.cityID;
+                    _this.supplierUser.townID = shop.townID;
+                    _this.supplierUser.address = shop.address;
+                    _this.supplierUser.socialCreditCode = shop.socialCreditCode;
+                    _this.supplierUser.businessLicenseImage =  shop.businessLicenseImage;
+                    _this.supplierUser.firstShopType =  shop.firstShopType;
+                    _this.supplierUser.secondShopType = shop.secondShopType;
+                    if(shop.mainpro != "" && shop.mainpro != null){
+							_this.mentuzCampNullList =  _this.setNewMainpro(shop.mainpro);
+                            _this.mentuzCampNullList.forEach(function (item) {
+                                if(item.checked){
+                                _this.shopMainPros.push(item.name)
+                                }
+                             })
+						}
+                    if(shop.cityID!=''&&shop.cityID!=null){
+                        _this.ChangeGetcity()
+                    }
+                    if(shop.townID!=''&&shop.townID!=null){
+                        _this.ChangeGetcTown();
+                    }
+                }else{
+                    CAIMEI.Alert(res.msg,'确定',false);
+                }
+
+            })
+        },
+        supplierRegister: function(){//供应商修改资料提交
+            var _self = this;
+            var pass = verifyForm();
+            if (_self.loginLoading) { return false; }
+            this.$nextTick(function() {
+                if (!pass) {return false;}
+                if (!_self.isAgree){
+                    _self.isShowAgree = true;
+                    return;
+                }
+                if(_self.supplierUser.townID == 0 || _self.supplierUser.address==''){
+                    _self.flagshow = true;
+                    setTimeout(function () {
+                        _self.flagshow = false;
+                    },2000)
+                     return  false;
+                }
+                if(_self.supplierUser.businessLicenseImage==''||_self.supplierUser.businessLicenseImage==null){
+                    $('#formbusinessLicenseImage').parent().addClass("error").find('.checked').removeClass("show");
+                    $('#formbusinessLicenseImage').siblings('.errTips').text('请上传营业执照图片').addClass("show");
+                    return  false;
+                }
+                if(_self.supplierUser.firstShopType == ''){
+                    $('#firstClubType').parent().addClass("error");
+                    $('#firstClubType').siblings('.errTips').text('请选择机构类型').addClass("show");
+                    return  false;
+                }
+                if(_self.shopMainPros == ''){
+                    $('#secondShopType').parent().addClass("error");
+                    $('#secondShopType').siblings('.errTips').text('请选择主营内容').addClass("show");
+                    return  false;
+                }
+                _self.loginLoading = true;
+                _self.supplierUser.mainpro = _self.shopMainPros.join("/");
+                UserApi.UpdateCompanyInfo(_self.supplierUser,function (response) {
+                    if(response.code === 0){
+                        CAIMEI.Alert('您的资料已提交成功,系统将在1-2个工作日内进行审核~','知道了',true,function () {
+                            window.location.href = '/index.html';
+                            _self.loginLoading = false;
+                        });
+                    } else {
+                        CAIMEI.Alert(response.msg,'确定',false);
+                        _self.loginLoading = false;
+                    }
+                });
+            });
+        },
+        ChangeFirstClubType:function(event){
+            $('#firstClubType').parent().removeClass("error");
+            $('#firstClubType').siblings('.errTips').removeClass("show");
+        },
+        ChangeSecondShopType:function(event){
+            $('#secondShopType').parent().removeClass("error");
+            $('#secondShopType').siblings('.errTips').removeClass("show");
+        },
+        GetProvinceFn: function(){//获取全部省份
+            var _this = this;
+            PublicApi.GetProvince({},function(response){
+                if(response.code == 0){
+                    _this.ProvinceList =response.data;
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        uploadBusinessLicenseImageFn: function(event){//上传营业执照
+            var _this = this;
+            var inputDOM = _this.$refs.businessLicenseImage;
+            var file = inputDOM.files;
+            _this.formData.append('file', file[0]);
+            PublicApi.uploadimg(_this.formData,function(response){
+                _this.supplierUser.businessLicenseImage = response.data;
+                $('#formbusinessLicenseImage').parent().removeClass("error");
+                $('#formbusinessLicenseImage').siblings('.errTips').removeClass("show");
+                event.target.value = '';
+            });
+        },
+        deleteBusinessImage:function(){//清楚营业执照图片
+            this.supplierUser.businessLicenseImage = '';
+        },
+        ChangeProvince:function () {
+           var _this = this;
+           if (_this.supplierUser.provinceID!=0){
+                _this.supplierUser.provinceID = event.target.value;
+                _this.ChangeGetcity();
+                 _this.supplierUser.cityID = 0;
+           }else {
+                _this.cityArray=[];
+                _this.townArray=[];
+                _this.supplierUser.townID=0;
+                _this.supplierUser.cityID = 0;
+           }
+        },
+        ChangeGetcity:function(event){//加载市
+            var _this = this;
+            PublicApi.GetCity({ provinceId: _this.supplierUser.provinceID },function(response){
+                if(response.code == 0 ){
+                    _this.cityArray = response.data;
+                    _this.supplierUser.cityID = event.target.value;
+                    if(_this.supplierUser.cityID==0){
+                        _this.townArray=[];
+                         _this.supplierUser.townID = 0;
+                    }else {
+                        _this.ChangeGetcTown();
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        ChangeGetcTown:function(event){//选择地区
+            var _this = this;
+            PublicApi.GetTown({ cityId: _this.supplierUser.cityID },function(response){
+                if(response.code == 0 ){
+                    _this.townArray = response.data;
+                    _this.supplierUser.townID = event.target.value;
+                    console.log(_this.supplierUser.townID)
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        mainProAdd: function(){//添加主营内容
+            var _self = this;
+            if(_self.mainProEdit==''){
+                 CAIMEI.dialog('请输入主营内容!',false);
+                 return
+            }
+            if (_self.mainProEdit.length>0) {
+                var obj = {name:_self.mainProEdit};
+                if(_self.checkedArray(_self.mainProEdit,_self.mentuzCampNullList)){
+                    CAIMEI.dialog('主营内容已存在!',false);
+                }else {
+                    _self.mentuzCampNullList.push(obj);
+                }
+            }
+        },
+         setNewMainpro:function(arr){//回显处理主营内容
+            var newArr = [];
+            arr.split('/').forEach(function(item,index){
+                newArr.push({value:(index+1).toString(),'name':item,checked:true});
+            });
+            return newArr
+        },
+        checkedArray:function(content,arr){//判断主营内容是否已存在
+            for(var i in arr){
+                if(arr[i].name == content){
+                    return true;
+                }
+            }
+            return false;
+        },
+        showPassword: function(event) {//密码眼睛切换
+            var el = event.currentTarget;
+            var pwdEle = $(el).siblings('input');
+            if(pwdEle.attr('type') === 'password') {
+                $(el).addClass('on');
+                pwdEle.attr('type','text');
+            } else {
+                $(el).removeClass('on');
+                pwdEle.attr('type','password');
+            }
+        },
+        blurHandle: function(event) { // 失去焦点校验
+            var el = event.currentTarget;
+            verifyHandle(el);
+        },
+        showSupplier:function () {//同意
+            var _self = this;
+            _self.showSupplierConfirm = false;
+        },
+        checkedIsAgreeFn:function () {//勾选协议
+            var _self = this;
+            _self.isAgree = !_self.isAgree;
+            if (_self.isAgree){
+                _self.isShowAgree = false;
+                _self.supplierUser.isAgreed = 1;
+            }else{
+                _self.isShowAgree = true;
+                _self.supplierUser.isAgreed = 0;
+            }
+        }
+    },
+    created: function () {
+
+    },
+    mounted: function () {
+        var _self = this;
+        if(globalUserData) {
+            _self.supplierUser.userId = globalUserData.userId;
+            _self.supplierUser.shopId = globalUserData.shopId;
+        }
+        _self.infoData = JSON.parse(CAIMEI.Storage.getItem('userInfo'));
+        _self.shopInfo();
+        _self.GetProvinceFn();
+    }
+});

+ 2 - 1
src/main/resources/static/js/product/instruement-list.js

@@ -60,11 +60,12 @@ var productList = new Vue({
             }
         })
     },
-       getproductList:function(){//一级商品列表
+       getproductList:function(){//分类商品列表
            var _self=this;
            ProductApi.GetSearchProduct(_self.params,function (res) {
                if( res.code==0){
                      var result = JSON.parse(res.data);
+                      _self.listData = [];
                       _self.listRecord = result.total;
                        var resultData = setSearchProductList(result.items, _self.userId, function(){
                             _self.$forceUpdate();

+ 2 - 2
src/main/resources/templates/account/login.html

@@ -53,14 +53,14 @@
             </div>
         </div>
     </div>
-    <div class="bg" v-if="stautsfalse">
+    <div class="bg" v-if="stautsfalse" :style="stautsfalse?'opacity:1':''">
         <div class="bg-content">
             <div class="bg-tittle"><p>提示</p><p class="icon" @click="hideBg"></p></div>
             <div class="text-conten">
                 <p class="status">{{text}}</p>
                 <p class="tip-p">联系电话:0755-22907771</p>
                 <p class="tip-p">地址:深圳市福田区锦峰大厦21B</p>
-                <a  href="/templates/account/changeinformation.html" v-if="infofalse" >修改申请信息</a>
+                <div  @click="information" v-if="infofalse" >修改申请信息</div>
             </div>
         </div>
     </div>

+ 15 - 46
src/main/resources/templates/account/supplier-information.html

@@ -7,29 +7,13 @@
     <link th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/account/register.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
-<body>
+<body class="bgNO">
 <!-- 引用头部 -->
 <template th:replace="account/components/header"></template>
 
 <!-- 注册账号 -->
 <div id="registerPage">
-    <div class="signAccount clear" >
-        <div class="supplierConfirm" v-if="showSupplierConfirm">
-            <div class="cont">
-                <h3>供应商注册需知</h3>
-                <p>采美采购商城(隶属于采美365网)是美容行业一站式B2B采购交易服务平台,供应商入驻需平台审核。注册说明如下,请您仔细阅读:</p>
-                <ul>
-                    <li>1、本商城商品需绝对保证正品,谢绝非自营/自有品牌(以登记备案为准),代理商应出具授权书等说明文件,杜绝山寨、假冒伪劣等侵权、侵害他人利益的行为。</li>
-                    <li>2、注册需要提供公司名称、营业执照、公司地址、联系人等基本信息。</li>
-                    <li>3、供应商注册审核通过后需缴纳平台信息服务管理费用。</li>
-                </ul>
-                <div class="btnLine">
-                    <p><input type="checkbox" checked readonly>已阅读供应商注册需知</p>
-                    <button type="button" @click="showSupplier">同意</button>
-                </div>
-            </div>
-        </div>
-        <div v-else>
+    <div class="signAccount clear" v-cloak>
             <div class="title">欢迎供应商入驻</div>
             <div class="registerShop clear">
                 <!--供应商注册表单-->
@@ -60,21 +44,21 @@
                     </div>
                     <div class="formLine">
                         <p><em>*</em>联系地址:</p>
-                        <select name="provinceID" id="cProvince" @change="ChangeProvince">
-                            <option value="">请选择</option>
-                            <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID' >{{item.name}}</option>
+                        <select name="provinceID" id="cProvince" @change="ChangeProvince"  v-model="supplierUser.provinceID">
+                            <option value="0">请选择</option>
+                            <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID'>{{item.name}}</option>
                         </select>
-                        <select name="cityID" id="cCity" @change="ChangeGetcity($event)" >
-                            <option value="">请选择</option>
+                        <select name="cityID" id="cCity" @change="ChangeGetcity($event)" v-model="supplierUser.cityID">
+                            <option value="0">请选择</option>
                             <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
                         </select>
-                        <select name="townID" id="cTown" @change="ChangeGetcTown($event)">
-                            <option value="">请选择</option>
+                        <select name="townID" id="cTown" @change="ChangeGetcTown($event)" v-model="supplierUser.townID">
+                            <option value="0">请选择</option>
                             <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
                         </select>
                         <textarea placeholder="请输入您的详细联系地址"  v-model="supplierUser.address" @blur="blurHandle($event)" needverify></textarea>
                         <i class="checked icon mIcon"></i>
-                        <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
+                        <span class="errTips icon mIcon" v-if="flagshow">请输入正确的联系地址</span>
                     </div>
                     <div class="formLine">
                         <p><em>*</em>营业执照编号:</p>
@@ -85,7 +69,7 @@
                     <div class="formLine clear">
                         <div class="form-upload">
                             <p><em>*</em>营业执照图片:</p>
-                            <div class="form-upload-image" v-if="supplierUser.businessLicenseImage!=''">
+                            <div class="form-upload-image" v-if="supplierUser.businessLicenseImage!=''&&supplierUser.businessLicenseImage!=null">
                                 <img class="upload-img" :src="supplierUser.businessLicenseImage" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
                                 <i class="icon mIcon" @click="deleteBusinessImage()"></i>
                             </div>
@@ -117,7 +101,7 @@
                     <div class="formLine">
                         <p><em>*</em>主营内容:</p>
                         <p class="business" id="secondShopType">
-                            <label v-for="pro in mentuzCampNullList" class="diyBox second"><input type="checkbox" name="secondShopType" v-model="userMainPros" :value="pro.name" @change="ChangeSecondShopType"><i class="icon mIcon">{{pro.name}}</i></label>
+                            <label v-for="pro in mentuzCampNullList" class="diyBox second"><input type="checkbox" name="secondShopType" v-model="shopMainPros" :value="pro.name" @change="ChangeSecondShopType"><i class="icon mIcon">{{pro.name}}</i></label>
                             <input type="text" placeholder="请输入其他自定义主营内容" v-model.trim="mainProEdit">
                             <a href="javascript:void(0);" @click="mainProAdd()">确认添加</a>
                         </p>
@@ -132,33 +116,18 @@
                             <a href="/help/1013.html">《隐私权政策》</a>
                         </p>
                         <span class="errTips icon mIcon show" v-if="isShowAgree">请阅读并同意协议</span>
-                        <button class="btn" type="button" :class="loginLoading ? 'disabled':''"  @click="supplierRegister()">同意并提交审核</button>
+                        <button class="btn" type="button" :class="loginLoading ? 'disabled':''"  @click="supplierRegister()">同意协议并提交审核</button>
                     </div>
                 </form>
             </div>
         </div>
-    </div>
-    <div class="content-model"  :class="isCodeModel ? 'active' : ''">
-        <div class="model-main">
-            <div class="model-title"><p>获取短信验证码</p><i class="icon mIcon icon-close"  @click="closeCodeModel"></i> </div>
-            <div class="model-content">
-                <div class="model-form">
-                    <input class="input" type="text" placeholder="请输入图形验证码" maxlength="4" v-model="imageCode">
-                    <div class="image"><img :src="codeImagePath" alt=""></div>
-                    <div class="refresh" @click="refreshCodeImage"><i class="icon mIcon"></i></div>
-                </div>
-                <div class="model-button">
-                    <div class="button"  @click="getMobileCodeFn">获取短信验证码</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/user.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/account/register-supplier.js(v=${version})}"></script>
+<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/account/supplier-information.js(v=${version})}"></script>
 </body>
 </html>

+ 1 - 1
src/main/resources/templates/index.html

@@ -175,7 +175,7 @@
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
-                                                <div class="price_text_tag right-box">
+                                                <div class="price_text_tag ">
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">

+ 66 - 33
src/main/resources/templates/product/instrument.html

@@ -79,13 +79,15 @@
                                                             </template>
                                                             <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                                 <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                    <p class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                                 </div>
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag" >
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -96,8 +98,10 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag" >
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -144,25 +148,32 @@
                                                             </template>
                                                             <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                                 <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>
                                                                 </div>
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                 <div class="price_text_tag">
+                                                                    <p class="listTag"  v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>
+                                                                 </div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
+                                                           <div class="price_text_tag">
+                                                             <p class="listTag" v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>
+                                                           </div>
                                                           <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">¥价格详聊</div>
                                                           <div class="main_price_show"  v-else>¥{{ pros.product.retailPrice | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -214,8 +225,10 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag ">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                              <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -226,8 +239,10 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag ">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                       <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -280,7 +295,7 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                                 <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
@@ -292,8 +307,10 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em>¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag ">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -344,8 +361,10 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -356,8 +375,10 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                       <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -407,8 +428,10 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                               <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -419,8 +442,10 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -471,8 +496,10 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                               <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -483,8 +510,10 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -534,8 +563,10 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -546,8 +577,10 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag" >
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>