updated:新增注册分配协销

src/main/resources/static/css/account/register.css

@@ -40,6 +40,14 @@ footer .footTop{display:none;}
 .formLine .form-upload-image .upload-img{width: 128px;height: 90px;display: block;}
 .formLine .form-upload-image .icon{width: 20px;height: 20px;display: block;position: absolute;right: 0;top: 0;cursor: pointer;}
 .formLine .form-upload-image .icon:before{width: 20px;height: 20px;background-position: -114px -140px;}
+.release-from .release-input .release-props{width: 100%;height: 38px;}
+.release-from .release-input .release-props .release-radio{width:150px;height:36px;margin-right:10px;line-height:34px;box-sizing:border-box;font-size:14px;text-align:center;display:inline-block}
+.release-from .release-input .release-props .release-radio.second{width:100px;}
+.release-from .release-input .release-props .release-radio input{display:none}
+.release-from .release-input .release-props .release-radio i{display:block;font-style:normal;cursor:pointer;width:100%;height:100%;position:relative;overflow:hidden;border-radius:2px;background:#FFF;border:1px solid #b8bfca;color:#627386;}
+.release-from .release-input .release-props .release-radio i:before{position:absolute;right:0;bottom:0;display:none;width:20px;height:20px;background-position:-208px -253px}
+.release-from .release-input .release-props .release-radio input:checked + i{border-color:#FF5B00;color:#FF5B00}
+.release-from .release-input .release-props .release-radio input:checked + i:before{display:block}
 
 .signAccount{width:498px;margin:0 auto;min-height: 900px;}
 .signAccount .title{height:42px;line-height:42px;font-weight:bold;font-size:32px;color:#22272e;text-align:center;padding:30px}
@@ -108,6 +116,14 @@ footer{display:none}
 .formLine .business{height:auto;position:relative}
 .formLine .business input[type="text"] {width:66vw;display: block;float: left;margin-right: 3vw;}
 .formLine .business a {display: block;float: left; width:21.4vw;height: 10.5vw;line-height: 10.5vw;font-size:3.4vw;color: #FF5B00;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;text-align: center;}
+.release-from .release-input .release-props{width: 100%;height: 36px;}
+.release-from .release-input .release-props .release-radio{    width: 26.7vw;height: 11.2vw;margin-right: 2.7vw;line-height: 11.2vw;box-sizing: border-box;font-size: 3.4vw;text-align: center;display: inline-block}
+/*.release-from .release-input .release-props .release-radio.second{width:100px;}*/
+.release-from .release-input .release-props .release-radio input{display:none}
+.release-from .release-input .release-props .release-radio i{display:block;font-style:normal;cursor:pointer;width:100%;height:100%;position:relative;overflow:hidden;border-radius:2px;background:#FFF;border:.27vw solid #b8bfca;color:#627386;}
+.release-from .release-input .release-props .release-radio i:before{position:absolute;right:0;bottom:0;display:none;width:5.3vw;height:5.3vw;background-position:-75.7vw -8.5vw}
+.release-from .release-input .release-props .release-radio input:checked + i{border-color:#FF5B00;color:#FF5B00}
+.release-from .release-input .release-props .release-radio input:checked + i:before{display:block}
 
 .advisory .mask{display: none;width: 100%;height: 100%;position: fixed;top: 0;left: 0;background-color: rgba(0,0,0,.5);z-index: 99;}
 .advisory .mask.active{display: block;}

src/main/resources/static/css/supplier-center/message.css

@@ -21,8 +21,12 @@ li{list-style:none}
     .content .section .section-content{width: 100%;height: auto;float: left;box-sizing: border-box;padding: 10px 0;}
     .content .section .section-content .new-list{width: 100%;height:80px;float: left;box-sizing: border-box;padding: 15px 0;}
     .content .section .section-content .new-list .text{line-height: 36px;float: left;}
+    /*消息通知样式修改*/
+    .content .section .section-content .new-list .text .msg-content {display: flex;flex-direction: column;}
+    .content .section .section-content .new-list .text .msg-content p span {margin-left: 100px;}
+
     .content .section .section-content .new-list .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px;line-height: 16px;cursor: pointer;}
-    .content .section .section-content .new-list .text p{width: 700px;height: 48px;line-height: 24px;font-size: 14px;color: #627386;float: left;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;}
+    .content .section .section-content .new-list .text p{width: 700px;line-height: 24px;font-size: 14px;color: #627386;float: left;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;}
     .content .section .section-content .new-list .text p .link{color: #E15621;cursor: pointer;text-decoration: underline;}
     .content .section .section-content .new-list .text p .link:hover{text-decoration: underline;}
     .content .section .section-content .new-list .time{line-height: 36px;font-size: 14px;color: #b8bfca;float: right;}

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

@@ -19,7 +19,8 @@ var registerPage = new Vue({
             phone:'',
             code:'',
             password:'',
-            password2:''
+            password2:'',
+            isSp: 1, //是否选择专属客户经理
         },
         clubUpgradeUser: {
             userId:'',

src/main/resources/static/js/user-center/mixins/noticeMixin.js

@@ -82,7 +82,13 @@ var noticeMixin = function () {// 通知消息
                 return map[cell.couponMessageType]
             },
             noticeServeText(cell){//服务通知文案处理
-                console.log('服务通知文案处理');
+                if (cell.shopTieredType > 4) {
+                    const map = {
+                        5: '采美平台已为您匹配专属客户经理，为您提供专业咨询服务。',
+                        6: '因公司内部人员调整需要，采美平台已为您更换了新客户经理。',
+                    }
+                    return map[cell.shopTieredType]
+                }
             },
             handleOrderClick($event){// 订单点击事件
                 let orderMessageType  = Number($event[0].attributes[0].value);

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

@@ -52,6 +52,16 @@
                     <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                     <i class="icon showPwd" @click="showPassword($event)"></i>
                 </div>
+                <div class="formLine release-from">
+                    <p><em>*</em>是否需要为您匹配专属客户经理：</p>
+                    <p>建议选择“需要”，采美专业的客户经理会为您提供更多支持，帮助您轻松采购！</p>
+                    <div class="release-input">
+                        <div class="release-props">
+                            <label class="release-radio"><input type="radio" name="commodityType" v-model="clubUser.isSp" value="1"><i class="icon mIcon">需要</i></label>
+                            <label class="release-radio"><input type="radio" name="commodityType" v-model="clubUser.isSp" value="2" checked><i class="icon mIcon">不需要</i></label>
+                        </div>
+                    </div>
+                </div>
                 <div class="subLine">
                     <p>
                         <span class="iconfont icon-weigouxuan" :class="isAgree ? 'icon-gouxuan' : 'icon-weigouxuan' " @click="checkedIsAgreeFn"></span>

src/main/resources/templates/user-center/message/list.html

@@ -48,7 +48,10 @@
                             <div class="new-list" v-for="(item, index) in messagesList" :key="index" :class="item.saved==1?'notclick':''">
                                 <div class="text">
                                     <input type="checkbox"  class="check" v-model="item.check" @change="checkedItemFn(item)" />
-                                    <p v-html="hanldeNoticeText(item)"></p>
+                                    <div class="msg-content" style="display: flex;flex-direction: column;">
+                                        <p v-html="hanldeNoticeText(item)"></p>
+                                        <p v-if="item.shopTieredType > 4">客户经理：{{item.superUserName}}<span style="margin-left: 100px;">手机号：{{item.mobile}}</span></p>
+                                    </div>
                                 </div>
                                 <div class="time">{{item.time}}</div>
                             </div>