Merge remote-tracking branch 'origin/developerB' into developerB

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

@@ -0,0 +1,48 @@
+@media screen and (min-width:768px) {
+  .crumbs{color: #22272e;font-size: 16px;}
+  .head-top{ height: 60px;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding: 0 20px;line-height: 60px}
+  .head-top div{display: inline-block}
+  .head-top .title-text{color: #22272e;}
+  .head-top .title-text span{color: #627386;}
+  .head-top .addHomepage{width: 128px;height: 36px;line-height:36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;
+  color: #e15616;text-align: center;float: right;margin-top: 12px;cursor: pointer}
+  .content{padding: 0 20px 20px 20px;background: #fff; margin-top: 8px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
+  .title-list{height: 55px;line-height: 55px;border-bottom: solid 1px #e2e7ef;}
+  .title-list li{list-style: none;display: inline-block;color: #627386;width: 25%; text-align: center}
+  .title-list li:nth-child(1){width: 12%;}
+  .title-list li:last-child{width: 11%}
+  .shopBanner ul li{list-style: none;display: inline-block;width: 25%; text-align: center;padding: 10px 0;color: #22272e;}
+  .shopBanner ul li:nth-child(1){width: 12%;}
+  .shopBanner ul li:last-child{width: 11%}
+  .advertisement-pic{width: 80px;height: 80px;border: solid 1px #e2e7ef}
+  .banner-title{vertical-align: middle; word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;
+    -webkit-line-clamp: 2; -webkit-box-orient: vertical; width: 200px}
+  .operate div{width: 52px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;line-height: 24px;
+  text-align: center;color: #e15616;margin:5px auto;cursor: pointer}
+  .bgFrom{position: fixed; background: rgba(34,39,46, 0.3);top: 0;left: 0; width: 100%;height: 100%;z-index: 1000;opacity: 0}
+  .bgFrom.show{opacity: 1}
+  .modalForm{ width: 650px;height: 350px;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16);border-radius: 2px;
+    border: solid 1px #efefef; position: absolute;left: 0;top: 0;right: 0;bottom: 0; margin: auto }
+  .modal-header{    height: 42px; background-color: #f8f8f8; border-radius: 2px 2px 0px 0px;border: solid 1px #efefef; line-height: 42px;padding: 0 16px;color: #333333;}
+  .icon.close{float: right; cursor: pointer;}
+  .icon.close:before{width: 20px;height: 20px;background-position: -315px 2px}
+  .modal-div span{color: #22272e;}
+  .modal-div input{width: 560px;height: 36px;line-height:36px;border-radius: 2px;border: solid 1px #b8bfca;margin-bottom: 15px;
+  color: #9aa5b5;padding-left: 5px}
+  .modal-content{padding: 15px}
+  input::placeholder{color: #9aa5b5;}
+  .upimg { width: 56px;height: 56px;background-color: #ffffff;border-radius: 2px; border: solid 1px #b8bfca; display: inline-block; position: relative;}
+  .icon.add:before { width: 25px;height: 25px;background-position: -168px -374px; position: relative;top: 15px;right: -15px;}
+  .add-pic {width: 56px;height: 56px;position: absolute;top: 50%; left: 50%;transform: translate(-50%,-50%); border-radius: 2px;opacity: 0;cursor: pointer;}
+  .upimg img {width: 100%; height: 100%;}
+  .red{color: red}
+  .upload-img .up{ vertical-align: baseline; height: 60px;display: inline-block}
+  .colorstyle{color: #e15616}
+  .saveBtn{ text-align: center;float: right;width: 68px;height: 32px; background-color: #e15616; border-radius: 2px;line-height: 32px;
+    color: #ffffff;cursor: pointer;}
+  .Note{float: left}
+
+}
+
+/*移动端*/
+@media screen and (max-width:768px) {}

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

@@ -0,0 +1,79 @@
+jqMultipleShow("click", ".navList", ".tab", ".con");
+var decoration = new Vue({
+    el:'#decoration',
+    data:{
+        iconflag:true,
+        bgflag:false,
+        logoShow:false,
+        formData:new FormData(),
+        params:{
+            title:'',
+            link:'',
+            info:'',
+            image:'',
+        },
+        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'},
+        ]
+    },
+    methods:{
+          uploadlogo:function () { //上传图片
+            var _this = this;
+            var inputDOM = _this.$refs.images;
+            var file = inputDOM.files;
+            _this.formData.append('file', file[0]);
+            SupplierApi.uploadimg(_this.formData,function(response){
+               _this.params.image = response.data;
+               _this.logoShow = true;
+               _this.iconflag = false;
+                event.target.value = '';
+            });
+        },
+        addpictures:function () {
+            var _this = this;
+            _this.name = '添加主页广告图';
+            _this.bgflag = true;
+            _this.iconflag=true;
+            _this.logoShow =false;
+        },
+        editpictures:function(item){
+             var _this = this;
+            _this.name = '编辑主页广告图';
+            _this.bgflag = true;
+            _this.params.title = item.title;
+            _this.params.link = item.link;
+            _this.params.info = item.info;
+            _this.params.image = item.image;
+            if(item.image !=''){
+            _this.params.image=item.image;
+            _this.logoShow = true;
+            _this.iconflag = false;
+             }else {
+                _this.logoShow = false;
+                _this.iconflag = true;
+             }
+        },
+        deletepictures:function(item){
+            CAIMEI.Modal('您确定要删除么？','取消','确定',function () {
+
+            })
+        },
+        close:function () {
+            var _this = this;
+            _this.bgflag = false;
+            _this.params.title = '';
+            _this.params.link = '';
+            _this.params.info = '';
+            _this.params.image = '';
+        }
+
+    },
+    mounted:function () {
+
+    }
+})

src/main/resources/templates/supplier-center/order/delivery-record.html

@@ -5,7 +5,7 @@
     <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/record.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/order/record.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
@@ -122,6 +122,6 @@
 <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/record.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/record.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -5,7 +5,7 @@
     <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/delivery.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/order/delivery.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
@@ -98,6 +98,6 @@
 <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/delivergoods.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/delivergoods.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -5,7 +5,7 @@
     <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/detail.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/order/detail.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
@@ -117,6 +117,6 @@
 <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/detail.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/detail.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -5,7 +5,7 @@
     <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/orderlist.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/order/orderlist.css(v=${version})}" rel="stylesheet" type="text/css">
 
 </head>
 <body>
@@ -141,6 +141,6 @@
 <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/orderlist.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/orderlist.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/supplier-center/order/logistics-add.html

@@ -5,7 +5,7 @@
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
     <link rel="stylesheet" th:href="@{/css/base/center.css(v=${version})}" type="text/css">
-    <link rel="stylesheet" th:href="@{/css/supplier-center/logistics.css(v=${version})}" type="text/css">
+    <link rel="stylesheet" th:href="@{/css/supplier-center/order/logistics.css(v=${version})}" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
@@ -132,6 +132,6 @@
     <template th:replace="components/footer"></template>
     <template th:replace="components/foot-link"></template>
     <script charset="utf-8" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}" type="text/javascript"></script>
-    <script charset="utf-8" th:src="@{/js/supplier-center/logistics-add.js(v=${version})}" type="text/javascript"></script>
+    <script charset="utf-8" th:src="@{/js/supplier-center/order/logistics-add.js(v=${version})}" type="text/javascript"></script>
 </body>
 </html>

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

@@ -5,7 +5,7 @@
     <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/logistics-detail.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/order/logistics-detail.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
@@ -102,6 +102,6 @@
 <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/logistics-detail.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/logistics-detail.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -5,7 +5,7 @@
     <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/logistics.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/order/logistics.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
@@ -140,6 +140,6 @@
     <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/logistics.js(v=${version})}"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/logistics.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/supplier-center/order/sales-list.html

@@ -4,7 +4,7 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
-    <link th:href="@{/css/supplier-center/saleslist.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/order/saleslist.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
@@ -51,6 +51,6 @@
 <!-- 引入底部 -->
 <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/saleslist.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/saleslist.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -4,14 +4,13 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
-
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div>
+<div class="settlement">
 
 </div>
 

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

@@ -4,20 +4,94 @@
 <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/shop/decoration.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div>
+<div id="decoration">
+    <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">
+                    <div class="title-text">主页广告设置<span>（主页广告图最多可上传4张图）</span></div>
+                    <div class="addHomepage" @click="addpictures">添加主页广告图</div>
+                </div>
+                <div class="content">
+                    <ul class="title-list">
+                        <li>图片</li>
+                        <li>标题</li>
+                        <li>链接</li>
+                        <li>说明</li>
+                        <li>操作</li>
+                    </ul>
+                    <div class="shopBanner">
+                        <ul v-for="item in list">
+                            <li ><img :src="item.image" class="advertisement-pic"/></li>
+                            <li><span class="banner-title">{{item.title}}</span></li>
+                            <li>{{item.link}}</li>
+                            <li>{{item.info}}</li>
+                            <li class="operate">
+                                <div class="operate-edit" @click="editpictures(item)">编辑</div>
+                                <div class="operate-delete" @click="deletepictures(item)">删除</div>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+
 
+        </div>
+           <div class="bgFrom" :class="bgflag?'show':''" v-if="bgflag">
+                <div class="modalForm">
+                    <div class="modal-header">
+                        <span class="shou-address add-main-image">{{name}}</span>
+                        <span class="icon close" @click="close"></span>
+                    </div>
+                    <div class="modal-content">
+                        <div class="modal-div">
+                            <span>标题 ：</span> <input type="text" name="title" v-model="params.title" class="modal-input-common keyword_filter">
+                        </div>
+                        <div class="modal-div">
+                            <span> 链接 ：</span>
+                             <input type="text" v-model="params.link" placeholder="例如：http://www.caimei365.com"class="modal-input-common keyword_filter" name="link">
+                         </div>
+                        <div class="modal-div">
+                            <span> 说明 ：</span> <input type="text" v-model="params.info" class="modal-input-common keyword_filter" name="info">
+                        </div>
+                        <div class="upload-img">
+                            <span class="red up">*</span><span class="up">图片：</span>
+                            <div class="upimg">
+                                <img class="center" :src="params.image" v-if="logoShow">
+                                <i class="icon mIcon add" v-if="iconflag"></i>
+                                <input type="file" ref="images" class="add-pic"  id="uploadfile" accept="image/*" @change="uploadlogo"/>
+                            </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>
+                        </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/shop/decoration.js(v=${version})}"></script>
 </body>
 </html>