供应商注册增加字段

src/main/resources/config/dev/application-dev.yml

@@ -54,8 +54,9 @@ logging:
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
   spiServer: https://spi-b.caimei365.com
+#  spiServer: http://192.168.2.68:8008
   coreServer: https://core-b.caimei365.com
-#  coreServer: http://192.168.2.75:18002
+#  coreServer: http://192.168.2.68:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

src/main/resources/static/css/base/form.css

@@ -7,7 +7,8 @@
 .formLine{padding-bottom:5px;font-size:14px;position:relative}
 .formLine input,.formLine select{box-sizing:border-box;width:100%;height:36px;line-height:34px;text-indent:1.2em;background-color:#FFF;border:1px solid #b8bfca;border-radius:2px}
 .formLine textarea{width:100%;height:114px;margin-top: 20px; box-sizing:border-box;border:solid 1px #b8bfca;padding:10px 16px;line-height:20px;resize: none;border-radius: 2px;outline: none;}
-.formLine select{width:154px}
+ .formLine textarea.none{margin-top: 0;}
+ .formLine select{width:154px}
 .formLine.error input,
 .formLine.error textarea,
 .formLine .address.error select,

src/main/resources/static/js/account/register-supplier.js

@@ -33,6 +33,11 @@ var registerPage = new Vue({
             secondShopType: '',
             mainProduct:'',
             isAgreed:0,
+            website:'',     //公司网址
+            wxOfficialAccount:'',//微信公众号
+            wxApplets:'',//微信小程序
+            mainProductDesc:'',
+            shopDesc:'',
             whichStep:0
         },
         isAgree:false,
@@ -72,10 +77,6 @@ var registerPage = new Vue({
             if (_self.loginLoading) { return false; }
             this.$nextTick(function() {
                 if (!pass) {return false;}
-                if (!_self.isAgree){
-                    _self.isShowAgree = true;
-                    return;
-                }
                 if(_self.supplierUser.passWordConfirm!=_self.supplierUser.password){
                     CAIMEI.dialog('两次密码输入不一致',false,function () {});
                     return;
@@ -94,6 +95,19 @@ var registerPage = new Vue({
                     $('#secondShopType').siblings('.errTips').text('请选择主营内容').addClass("show");
                     return  false;
                 }
+                if(_self.supplierUser.website!=''){
+                    var WebRegExp = new RegExp(/^((http|ftp|https):\/\/[a-zA-Z0-9]|[a-zA-Z0-9])[-a-zA-Z0-9]{0,62}(.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+.?$/);
+                    console.log(WebRegExp.test(_self.supplierUser.website));
+                    if (!WebRegExp.test(_self.supplierUser.website)) {
+                        $('#website').parent().addClass("error");
+                        $('#website').siblings('.errTips').text('请填写正确的网址').addClass("show");
+                        return false;
+                    }
+                }
+                if (!_self.isAgree){
+                    _self.isShowAgree = true;
+                    return;
+                }
                 _self.loginLoading = true;
                 _self.supplierUser.mainProduct = _self.userMainPros.join("/");
                 UserApi.SupplierRgister(_self.supplierUser,function (response) {

src/main/resources/static/js/account/supplier-information.js

@@ -20,7 +20,12 @@ var registerPage = new Vue({
             firstShopType:'',
             secondShopType: '',
             mainProduct:'',
-            isAgreed:1
+            isAgreed:1,
+            website:'',     //公司网址
+            wxOfficialAccount:'',//微信公众号
+            wxApplets:'',//微信小程序
+            mainProductDesc:'',
+            shopDesc:'',
         },
         isAgree:true,
         isShowAgree:false,
@@ -69,6 +74,11 @@ var registerPage = new Vue({
                     _this.supplierUser.cityId = shop.cityId;
                     _this.supplierUser.townId= shop.townId;
                     _this.supplierUser.address = shop.address;
+                    _this.supplierUser.website = shop.website;
+                    _this.supplierUser.wxOfficialAccount = shop.wxOfficialAccount;
+                    _this.supplierUser.wxApplets = shop.wxApplets;
+                    _this.supplierUser.mainProductDesc = shop.mainProductDesc;
+                    _this.supplierUser.shopDesc = shop.shopDesc;
                     _this.supplierUser.socialCreditCode = shop.socialCreditCode;
                     _this.supplierUser.businessLicense =  shop.businessLicense;
                     _this.supplierUser.firstShopType =  shop.firstShopType;
@@ -99,10 +109,6 @@ var registerPage = new Vue({
             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 () {
@@ -125,6 +131,18 @@ var registerPage = new Vue({
                     $('#secondShopType').siblings('.errTips').text('请选择主营内容').addClass("show");
                     return  false;
                 }
+                if(_self.supplierUser.website!=''){
+                    var WebRegExp = new RegExp(/^((http|ftp|https):\/\/[a-zA-Z0-9]|[a-zA-Z0-9])[-a-zA-Z0-9]{0,62}(.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+.?$/);
+                    if (!WebRegExp.test(_self.supplierUser.website)) {
+                        $('#website').parent().addClass("error");
+                        $('#website').siblings('.errTips').text('请填写正确的网址').addClass("show");
+                        return false;
+                    }
+                }
+                if (!_self.isAgree){
+                    _self.isShowAgree = true;
+                    return;
+                }
                 _self.loginLoading = true;
                 _self.supplierUser.mainProduct = _self.shopMainPros.join("/");
                 UserApi.UpdateCompanyInfo(_self.supplierUser,function (response) {

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

@@ -36,6 +36,9 @@
             medicalPracticeLicense:'',//资质
             mainProduct:'',//主营产品
             businessScope:'',//经营内容
+            website:'',     //公司网址
+            wxOfficialAccount:'',//微信公众号
+            wxApplets:'',//微信小程序
             shopDesc:'',//公司介绍
             mainProductDesc:'',//主打说明
         },
@@ -143,6 +146,9 @@
                     _this.params2.firstShopType = shop.firstShopType;
                     _this.params2.secondShopType = shop.secondShopType;
                     _this.params2.medicalPracticeLicense = shop.medicalPracticeLicense;
+                    _this.params2.website = shop.website;
+                    _this.params2.wxOfficialAccount = shop.wxOfficialAccount;
+                    _this.params2.wxApplets = shop.wxApplets;
                     _this.params2.shopDesc = shop.shopDesc;
                     _this.params2.mainProductDesc = shop.mainProductDesc;
                     _this.params3.socialCreditCode = shop.socialCreditCode;
@@ -214,6 +220,14 @@
                 }else if(_self.tabCurrentIndex==3){
                     params = _self.params3
                 }
+                if(_self.params2.website!=''){
+                    var WebRegExp = new RegExp(/^((http|ftp|https):\/\/[a-zA-Z0-9]|[a-zA-Z0-9])[-a-zA-Z0-9]{0,62}(.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+.?$/);
+                    if (!WebRegExp.test(_self.params2.website)) {
+                        $('#website').parent().addClass("error");
+                        $('#website').siblings('.errTips').text('请填写正确的网址').addClass("show");
+                        return false;
+                    }
+                }
               SupplierApi.modifiedData(params,function (res) {
                      console.log(res)
                       if(res.code === 0){

src/main/resources/templates/account/register-supplier.html

@@ -151,6 +151,36 @@
                         </p>
                         <span class="errTips icon mIcon" tips="请选择或添加主营产品"></span>
                     </div>
+                    <div class="formLine">
+                        <p>官网地址：</p>
+                        <input type="text" v-model="supplierUser.website" placeholder="请输入网址" maxlength="100" id="website"  @blur="blurHandle($event)">
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入正确的公司名称"></span>
+                    </div>
+                    <div class="formLine">
+                        <p>微信公众号：</p>
+                        <input type="text" v-model="supplierUser.wxOfficialAccount" placeholder="请输入微信公众号名称"  maxlength="20" >
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入微信公众号名称"></span>
+                    </div>
+                    <div class="formLine">
+                        <p>微信小程序：</p>
+                        <input type="text" v-model="supplierUser.wxApplets" placeholder="请输入微信小程序名称" maxlength="20">
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入微信小程序名称"></span>
+                    </div>
+                    <div class="formLine">
+                        <p>主打系列商品说明：</p>
+                        <textarea class="none" placeholder="请输入公司主打系列商品说明"  v-model="supplierUser.mainProductDesc" maxlength="5000"></textarea>
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入公司主打系列商品说明"></span>
+                    </div>
+                    <div class="formLine">
+                        <p>公司介绍：</p>
+                        <textarea class="none" placeholder="请输入公司介绍"  v-model="supplierUser.shopDesc" maxlength="5000"></textarea>
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入公司介绍"></span>
+                    </div>
                     <div class="subLine">
                         <p>
                             <span class="iconfont icon-weigouxuan" :class="isAgree ? 'icon-gouxuan' : 'icon-weigouxuan' " @click="checkedIsAgreeFn"></span>

src/main/resources/templates/account/supplier-information.html

@@ -107,6 +107,36 @@
                         </p>
                         <span class="errTips icon mIcon" tips="请选择或添加主营产品"></span>
                     </div>
+                    <div class="formLine">
+                        <p>官网地址：</p>
+                        <input type="text" v-model="supplierUser.website" placeholder="请输入网址" maxlength="100" id="website" @blur="blurHandle($event)">
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入网址"></span>
+                    </div>
+                    <div class="formLine">
+                        <p>微信公众号：</p>
+                        <input type="text" v-model="supplierUser.wxOfficialAccount" placeholder="请输入微信公众号名称"  maxlength="20" >
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入微信公众号名称"></span>
+                    </div>
+                    <div class="formLine">
+                        <p>微信小程序：</p>
+                        <input type="text" v-model="supplierUser.wxApplets" placeholder="请输入微信小程序名称" maxlength="20">
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入微信小程序名称"></span>
+                    </div>
+                    <div class="formLine">
+                        <p>主打系列商品说明：</p>
+                        <textarea class="none" placeholder="请输入公司主打系列商品说明"  v-model="supplierUser.mainProductDesc" maxlength="5000"></textarea>
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入公司主打系列商品说明"></span>
+                    </div>
+                    <div class="formLine">
+                        <p>公司介绍：</p>
+                        <textarea class="none" placeholder="请输入公司介绍"  v-model="supplierUser.shopDesc" maxlength="5000"></textarea>
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入公司介绍"></span>
+                    </div>
                     <div class="subLine">
                         <p>
                             <span class="iconfont icon-weigouxuan" :class="isAgree ? 'icon-gouxuan' : 'icon-weigouxuan' " @click="checkedIsAgreeFn"></span>

src/main/resources/templates/article/components/article-footer.html

@@ -5,6 +5,11 @@
         <div class="dizhi">
             <p>Copyright©2015-2021 CAIMEI365.com All Rights Reserved.</p>
             <p>深圳市采美信息技术有限公司版权所有<a href="https://beian.miit.gov.cn" target="_blank" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号</a></p>
+            <span>
+                <!-- CNZZ统计 start -->
+                <script type="text/javascript">document.write(unescape("%3Cspan id='cnzz_stat_icon_1279558759'%3E%3C/span%3E%3Cscript src='https://s9.cnzz.com/z_stat.php%3Fid%3D1279558759%26show%3Dpic' type='text/javascript'%3E%3C/script%3E"));</script>
+                <!-- CNZZ统计 start -->
+            </span>
         </div>
     </div>
 </div>

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

@@ -175,6 +175,24 @@
                                     <a href="javascript:void(0);" @click="shopScopeAdd()">确认添加</a>
                                 </p>
                                 <span class="errTips icon mIcon" tips="请选择或添加主营产品"></span>
+                            </div>
+                            <div class="formLine" >
+                                <p>网站地址：</p>
+                                <input  class="massageBtn"  type="text" v-model="params2.website" placeholder="请输入网址" id="website"  @blur="blurHandle($event)">
+                                <i class="checked icon mIcon"></i>
+                                <span class="errTips icon mIcon" tips="请输入公司名称"></span>
+                            </div>
+                            <div class="formLine" >
+                                <p>微信公众号：</p>
+                                <input  class="massageBtn"  type="text" v-model="params2.wxOfficialAccount" placeholder="请输入微信公众号名称">
+                                <i class="checked icon mIcon"></i>
+                                <span class="errTips icon mIcon" tips="请输入微信公众号名称"></span>
+                            </div>
+                            <div class="formLine" >
+                                <p>微信小程序：</p>
+                                <input  class="massageBtn"  type="text" v-model="params2.wxApplets" placeholder="请输入微信小程序名称">
+                                <i class="checked icon mIcon"></i>
+                                <span class="errTips icon mIcon" tips="请输入微信小程序名称"></span>
                             </div>
                              <div class="formLine info">
                                  <p><em>*</em>公司介绍：</p>