Quellcode durchsuchen

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

chao vor 4 Jahren
Ursprung
Commit
7e5e6d8b24

+ 28 - 16
src/main/resources/static/css/supplier-center/operation/list.css

@@ -68,21 +68,33 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-.navLayout{background:#FFF;border-top:1px solid #F5F5F5;border-bottom:1px solid #F5F5F5;}
-.navLayout .crumbs{display:none;}
-.navLayout .left{width:29.3vw;border-right:1px solid #F5F5F5;line-height:11.8vw;white-space:nowrap;text-indent:3.3vw;font-size:3.4vw;}
-.navLayout .left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5;font-size: 3.7vw;}
-.navLayout .navList .tab{display:block;color:#22272e;position:relative}
-.navLayout .navList .tab:before{content:'\276F';font-weight:normal;position:absolute;right:1.4vw;top:1vw;transform:rotate(90deg);width:6.4vw;height:6.4vw;line-height:6.4vw;text-align:center;color:#bec2c9}
-.navLayout .navList .con a{display:block;color:#9aa5b5;}
-.navLayout .navList.on .tab:before{top:4vw;transform:rotate(270deg);color:#e15616}
-.navLayout .navList.on .tab{color:#e15616}
-.navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
-.navLayout .right{width:70.5vw}
-
-
-
-
-
+    .navLayout{border-top:1px solid #F5F5F5;border-bottom:1px solid #F5F5F5;}
+    .navLayout .crumbs{display:none;}
+    .navLayout .left{width:29.3vw;border-right:1px solid #F5F5F5;line-height:11.8vw;white-space:nowrap;text-indent:3.3vw;font-size:3.4vw;}
+    .navLayout .left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5;font-size: 3.7vw;}
+    .navLayout .navList .tab{display:block;color:#22272e;position:relative}
+    .navLayout .navList .tab:before{content:'\276F';font-weight:normal;position:absolute;right:1.4vw;top:1vw;transform:rotate(90deg);width:6.4vw;height:6.4vw;line-height:6.4vw;text-align:center;color:#bec2c9}
+    .navLayout .navList .con a{display:block;color:#9aa5b5;}
+    .navLayout .navList.on .tab:before{top:4vw;transform:rotate(270deg);color:#e15616}
+    .navLayout .navList.on .tab{color:#e15616}
+    .navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
+    .order-header{padding: 2.7vw 4vw;background: #fff}
+    .search{width:100%;height: 11.8vw;border: 1px solid #b8bfca;margin-bottom: 2.7vw;line-height: 11.8vw;}
+    .search span.label{padding-left: 2.7vw;color: #627386}
+    .search-input {height: -webkit-fill-available;width: 70vw;border: none;border-radius: .27vw}
+    input::placeholder{color: #9aa5b5}
+    .header-button{width: 35.3vw;height: 11.2vw;border: 1px solid #e15616;text-align: center;line-height: 11.2vw;background: #ffe6dc;margin: 2.7vw auto}
+    .header-button >a{color: #e15616;font-size: 3.7vw}
+    .section .list{margin: 2.7vw 0;background: #fff;padding: 2.7vw 3.3vw;}
+    .list div span{display: inline-block;line-height: 6.4vw;color: #9aa5b5;}
+    .list-one span{width: 35%;font-size: 3.2vw}
+    .list div span p{color: #22272e;font-size: 3.6vw}
+    .list-one span:last-child{width: 27%}
+    .operat{float: right}
+    .list div{margin-bottom: 1.7vw}
+    .operat  a{width: 22.4vw;height: 9.6vw;line-height: 9.6vw;text-align: center;display: inline-block; border-radius: 6.4vw;
+        font-size: 3.4vw;margin-left: 2.7vw}
+    .operat  a.del{border: 1px solid #f94b4b;background: #ffd8d8;color: #f94b4b;}
+    .operat  a.upd{border: 1px solid #1890f9;background: #e0f1ff;color: #1890f9;width: 23vw}
 }
 

+ 2 - 2
src/main/resources/static/css/supplier-center/shop/brand.css

@@ -65,7 +65,7 @@
    .order-border span{color: #627386;padding-left: 2.7vw}
    .Buyer{color: #9aa5b5;height: -webkit-fill-available;border: 0;width: 70vw}
    input::placeholder,textarea::placeholder{color: #9aa5b5}
-   .state{width: 93.4vw;height: 11.7vw;line-height: 11.7vw;padding-left: 1.3vw;border: 1px solid #b8bfca}
+   .state{width: 93.4vw;height: 11.7vw;line-height: 11.7vw;padding-left: 1.3vw;border: 1px solid #b8bfca;background: #fff}
    #newBtn>div{width: 40vw;height: 11.2vw;line-height: 11.2vw;text-align: center;display: inline-block;margin-left: 4vw;}
    #newBtn>.query-btn{border: .27vw solid #e15616;background: #e15616;color: #fff;}
    #newBtn>.addBrand{border: .27vw solid #e15616;background: #ffe6dc;color: #e15616;}
@@ -98,7 +98,7 @@
   .add-pic{ width:13vw;height: 13vw;position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);border-radius: .53vw;opacity: 0;cursor: pointer}
   .brand-content .label{width: 18.6vw;text-align: right; display: inline-block;font-size: 3vw}
   .font-color{color: #e15616;}
-  .tishiyu{font-size:2.2vw;text-align: right; margin-top: 1.3vw}
+  .tishiyu{font-size:2.2vw;text-align: left; margin-top: 1.3vw;    padding-left: 19.7vw}
   .brand-description span{vertical-align: top; }
   .miaoshu{width: 46.4vw;height: 16vw;border-radius: .53vw;border: 1px solid #b8bfca;padding: 1.3vw;resize: none;display: inline-block;font-size: 3vw}
   .box-btn{padding: 2.7vw;}

+ 44 - 4
src/main/resources/static/css/supplier-center/shop/goods.css

@@ -16,9 +16,9 @@ li{list-style: none}
   .goods-main-empty p{font-size: 14px;color: #333;}
   .goods-main-empty p a{color: #e15616;text-decoration: underline;margin: 0 3px;}
   .goods-title{ height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;padding: 0 20px}
-  .goods-main .goods-table ul li{float:left;width: 10%;text-align: center}
+  .goods-main .goods-table ul li{float:left;width: 8%;text-align: center;color: #22272e;}
   .goods-main .goods-table ul li:nth-child(2){ width: 25%;}
-  .goods-main .goods-table ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(4){width: 16%}
+  .goods-main .goods-table ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(4){width: 20%}
   .goods-main .goods-table ul li:last-child{width: 23%;position: relative}
   .tbody ul li{height: 96px;font-size: 12px;}
   .tbody ul{overflow: hidden;padding: 0 20px}
@@ -48,6 +48,7 @@ li{list-style: none}
   .goods-container .good-footer .footer-right .btn.icon-weigouxuan{border: solid 1px #9aa5b5;color: #22272e;opacity: .5;}
   .goods-container .good-footer .footer-right .btn.icon-gouxuan{background-color: #e15616;}
   .bg-gouxuan{background-color: #f0f3f7;}
+  .good-price p {display: inline-block}
   }
 
 /*移动*/
@@ -59,9 +60,48 @@ li{list-style: none}
    .form-row.low span{color: #627386;padding-left: 2.7vw;}
    .form-row .Buyer{color: #9aa5b5;height: -webkit-fill-available;border: 0;width: 70vw}
    input::placeholder,textarea::placeholder{color: #9aa5b5}
-   .state{width: 93.4vw;height: 11.7vw;line-height: 11.7vw;padding-left: 1.3vw;border: 1px solid #b8bfca;color: #627386;margin-top: 1.3vw;}
+   .state{width: 93.4vw;height: 11.7vw;line-height: 11.7vw;padding-left: 1.3vw;border: 1px solid #b8bfca;color: #627386;
+   margin-top: 1.3vw;background: #fff}
    .form-row.fenlei .state{width: 29.5vw;margin-left:.8vw;}
    .form-row.fenlei span{display: block;}
    #newBtn .query-btn{border: 1px solid #e15616;width: 35.3vw;height: 11.2vw;line-height: 11.2vw;text-align: center;color: #e15616;background: #ffe6dc;margin: auto}
-
+   .good-info img{width: 15vw;height: 15vw}
+   .goods-main{margin-top: 2.7vw}
+   .good-name{display: inline-block;color:#22272e;margin-left: 8px;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: 37vw}
+   .goods-title li{display: inline-block;color: #9aa5b5;font-size: 3.6vw}
+   .table-list{background: #fff;margin-bottom: 2.7vw;padding: 2.7vw;}
+   .table-list .goods-title{overflow: hidden;
+    padding: 2.3vw 0;}
+    .goods-title li:nth-child(1){float: left;font-size: 3.2vw;}
+    .goods-title li:nth-child(2){float: right;margin-right: 2.7vw}
+   .checkbox .icon-weigouxuan:before{ width: 16px;height: 16px; background-position:-9.3vw -53.5vw;transition: none;}
+   .checkbox .icon-gouxuan:before{width: 16px; height: 16px;background-position:-.53vw -53.5vw;transition: none}
+   .checkbox .box{display: inline-block}
+   .good-price span{display: block;color: #9aa5b5;font-size: 3.2vw}
+   .good-price p{display: inline-block;color: #22272e;font-size: 3.4vw}
+   .good-price{line-height: 6.4vw;margin-top: 2.6vw}
+   .good-status{overflow: hidden;line-height: 6.4vw;margin: 2.7vw 0}
+   .good-status .good-left{float: left}
+   .good-status .good-right{float: right}
+   .good-status span{color: #9aa5b5;font-size: 3.2vw}
+   .good-status  p{color: #22272e;font-size: 3.4vw}
+   .good-handle a{width: 20vw;height: 9.5vw;line-height: 9.5vw;text-align: center;border-radius: 6.4vw;font-size: 3vw;
+   display: inline-block;margin-left: 2.5vw}
+   .good-handle{float: right;margin: 1.7vw 0}
+   .tbody{overflow: hidden;}
+   .good-info .btn.eit{border:1px solid #1890f9;color: #1890f9;background: #e0f1ff;display: inline-block;width: 20vw;height: 9.5vw;
+   line-height: 9.5vw;text-align: center;border-radius: 6.4vw;font-size: 3vw;margin-left: 16.7vw}
+   .good-handle a.primary{border:1px solid #e15616;color: #e15616;background: #ffe6dc}
+   .good-handle a.down{border:1px solid #627386;color: #627386;background: #f0f3f7}
+   .good-handle a.success{border:1px solid #1890f9;color: #1890f9;background: #e0f1ff;width: 23vw}
+   .good-handle a.danger{width:24vw;border:1px solid  #f94b4b;color: #f94b4b;background: #ffd8d8}
+   .good-footer{width: 100%;height: 11.9vw;background: #fff; padding: 1.7vw 0}
+   .good-footer .footer-left{float: left;margin-left: 5.3vw}
+   .good-footer .checkbox {line-height: 11.9vw;}
+   .good-footer .checkbox .box{line-height:11.9vw;float: left;}
+   .good-footer .checkbox span{display: inline-block;float: left;margin-left:2.7vw;}
+   .good-footer .footer-right{float: right;margin-top: 1.7vw;}
+   .good-footer .footer-right .btn{ width: 20.8vw;height: 8.5vw;display: block;line-height: 8.5vw;text-align: center;font-size: 3.4vw;border-radius: 6.4vw;margin-right: 30px;color: #FFF;}
+   .good-footer .footer-right .btn.icon-weigouxuan{border: solid .27vw #b8bfca;color: #627386;}
+   .good-footer .footer-right .btn.icon-gouxuan{background-color: #ffe6dc; color: #e15616;border: .27vw solid #e15616}
  }

+ 30 - 13
src/main/resources/static/css/user-center/operation/list.css

@@ -68,19 +68,36 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-.navLayout{background:#FFF;border-top:1px solid #F5F5F5;border-bottom:1px solid #F5F5F5;}
-.navLayout .crumbs{display:none;}
-.navLayout .left{width:29.3vw;border-right:1px solid #F5F5F5;line-height:11.8vw;white-space:nowrap;text-indent:3.3vw;font-size:3.4vw;}
-.navLayout .left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5;font-size: 3.7vw;}
-.navLayout .navList .tab{display:block;color:#22272e;position:relative}
-.navLayout .navList .tab:before{content:'\276F';font-weight:normal;position:absolute;right:1.4vw;top:1vw;transform:rotate(90deg);width:6.4vw;height:6.4vw;line-height:6.4vw;text-align:center;color:#bec2c9}
-.navLayout .navList .con a{display:block;color:#9aa5b5;}
-.navLayout .navList.on .tab:before{top:4vw;transform:rotate(270deg);color:#e15616}
-.navLayout .navList.on .tab{color:#e15616}
-.navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
-.navLayout .right{width:70.5vw}
-
-
+    .navLayout{border-top:1px solid #F5F5F5;border-bottom:1px solid #F5F5F5;}
+    .navLayout .crumbs{display:none;}
+    .navLayout .left{width:29.3vw;border-right:1px solid #F5F5F5;line-height:11.8vw;white-space:nowrap;text-indent:3.3vw;font-size:3.4vw;}
+    .navLayout .left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5;font-size: 3.7vw;}
+    .navLayout .navList .tab{display:block;color:#22272e;position:relative}
+    .navLayout .navList .tab:before{content:'\276F';font-weight:normal;position:absolute;right:1.4vw;top:1vw;transform:rotate(90deg);width:6.4vw;height:6.4vw;line-height:6.4vw;text-align:center;color:#bec2c9}
+    .navLayout .navList .con a{display:block;color:#9aa5b5;}
+    .navLayout .navList.on .tab:before{top:4vw;transform:rotate(270deg);color:#e15616}
+    .navLayout .navList.on .tab{color:#e15616}
+    .navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
+    .order-header{padding: 2.7vw 4vw;background: #fff}
+    .search{width:100%;height: 11.8vw;border: 1px solid #b8bfca;margin-bottom: 2.7vw;line-height: 11.8vw;}
+    .search span.label{padding-left: 2.7vw;color: #627386}
+    .search-input {height: -webkit-fill-available;width: 70vw;border: none;border-radius: .27vw}
+    input::placeholder{color: #9aa5b5}
+    .header-button a{width: 35.3vw;height: 11.2vw;border: 1px solid #e15616;text-align: center;line-height: 11.2vw;background: #ffe6dc;
+    display: inline-block;color: #e15616;font-size: 3.7vw}
+    .header-button .btn-serch{color: #fff;background: #e15616}
+    .header-button{text-align:center;padding: 1.7vw 0;}
+    .section .list{margin: 2.7vw 0;background: #fff;padding: 2.7vw 3.3vw;}
+    .list div span{display: inline-block;line-height: 6.4vw;color: #9aa5b5;}
+    .list-one span{width: 35%;font-size: 3.2vw}
+    .list div span p{color: #22272e;font-size: 3.6vw}
+    .list-one span:last-child{width: 27%}
+    .operat{float: right}
+    .list div{margin-bottom: 1.7vw}
+    .operat  a{width: 22.4vw;height: 9.6vw;line-height: 9.6vw;text-align: center;display: inline-block; border-radius: 6.4vw;
+    font-size: 3.4vw;margin-left: 2.7vw}
+    .operat  a.del{border: 1px solid #f94b4b;background: #ffd8d8;color: #f94b4b;}
+    .operat  a.upd{border: 1px solid #1890f9;background: #e0f1ff;color: #1890f9;width: 23vw}
 
 
 

+ 1 - 1
src/main/resources/static/js/common/serviceapi/user.service.js

@@ -17,7 +17,7 @@ var UserApi = {
                 });
         },
         ToWechatPolling : function (params,callback) {//扫码登录轮询
-            Http.AjaxService({ url:'user/polling', type:'get', data:params, json:false})
+            Http.AjaxService({ url:'/user/polling', type:'get', data:params, json:false})
                 .then(function(res){
                     callback(res)
                 });

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

@@ -31,6 +31,7 @@ var myGoods = new Vue({
         checkList:[],
         isCheckedAll:false,
         noMore:false,
+        promotions:{},
     },
     computed: {
         pageTotal: function () {
@@ -67,6 +68,7 @@ var myGoods = new Vue({
                         _this.listRecord = data.totalRecord;
                         var NewProduct = [],isAddFeatured=false;
                         _this.productsList.map(function(el){
+                           _this.promotions = el.promotions;
                             if(_this.featuredNum<4){
                                 if(el.validFlag == 2 && el.featuredFlag ==0 ){
                                     isAddFeatured = true;
@@ -381,20 +383,20 @@ var myGoods = new Vue({
                 var windowHeight = window.innerHeight;
                 if (scrollTop + windowHeight >= scrollHeight) {
                     //此处是滚动条到底部时候触发的事件,在这里写要加载的数据,或者是拉动滚动条的操作
-                    var totalPage = Math.ceil(_self.listRecord / _self.listQuery.pageSize)?Math.ceil(_self.listRecord / _self.listQuery.pageSize):1;
-                    var next = _self.listQuery.pageNum+1;
+                    var totalPage = Math.ceil(_this.listRecord / _this.listQuery.pageSize)?Math.ceil(_this.listRecord / _this.listQuery.pageSize):1;
+                    var next = _this.listQuery.pageNum+1;
                     if(next <= totalPage){
-                        if (_self.requestFlag){
-                            _self.listQuery.pageNum = next;
-                            if (_self.isRequset) {
+                        if (_this.requestFlag){
+                            _this.listQuery.pageNum = next;
+                            if (_this.isRequset) {
                                 // 获取列表数据
-                                _self.MyOrderList();
+                                _this.MyOrderList();
                             }
                         }
-                        _self.requestFlag = false;
+                        _this.requestFlag = false;
                     }else{
                         //到底了
-                        _self.noMore = true;
+                        _this.noMore = true;
                         $('footer').removeClass("noneImportant");
                     }
                 }

+ 1 - 1
src/main/resources/templates/supplier-center/components/tableft.html

@@ -56,7 +56,7 @@
                     <a href="/supplier/decoration.html">装扮主页</a>
                     <a href="/supplier/release.html">发布商品</a>
                     <a href="/supplier/goods.html">我的商品</a>
-                    <a href="/supplier/goods.html">品牌管理</a>
+                    <a href="/supplier/brand.html">品牌管理</a>
                 </div>
             </div>
             <div class="centerList">

+ 29 - 4
src/main/resources/templates/supplier-center/operation/list.html

@@ -4,6 +4,7 @@
 <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/operation/list.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -12,7 +13,7 @@
 <!-- 运营人员管理 -->
 <div id="operationPage" v-cloak>
     <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+        <div class="crumbs" v-if="isPC">
             <span>机构管理中心</span>
             <span>&gt;</span>
             <span>运营人员管理</span>
@@ -25,11 +26,11 @@
                     <div class="header-bt">
                         <div class="header-search">
                             <div class="search">
-                                <span class="label">姓名:</span>
+                                <span class="label">姓名</span>
                                 <input type="text" v-model="listQuery.linkName" placeholder="请输入运营人员姓名" class="search-input">
                             </div>
                             <div class="search">
-                                <span class="label">手机号:</span>
+                                <span class="label">手机号</span>
                                 <input type="text" v-model="listQuery.mobile" placeholder="请输入运营人员手机号" class="search-input">
                             </div>
                         </div>
@@ -44,7 +45,7 @@
                 </div>
                 <div class="container clear" v-else>
                     <!--数据为空-->
-                    <div class="section" v-if="operationList.length > 0">
+                    <div class="section" v-if="operationList.length > 0&& isPC">
                         <div class="title">
                             <div class="td td-1">姓名</div>
                             <div class="td td-2">手机号</div>
@@ -76,6 +77,30 @@
                             </div>
                         </div>
                     </div>
+                    <div class="section" v-if="operationList.length > 0&& !isPC">
+                            <div class="list"  v-for="(item, index) in operationList" :key="index">
+                                  <div class="list-one">
+                                      <span>姓名:<p>{{item.linkName}}</p></span>
+                                      <span>手机号:<p>{{item.mobile}}</p></span>
+                                      <span>邀请码:<p>{{item.invitationCode}}</p></span>
+                                  </div>
+                                  <div class="list-one">
+                                      <span>添加时间:<p>{{item.addTime}}</p></span>
+                                      <span>绑定时间:<p>{{item.bindTime}}</p></span>
+                                      <span>邀请码有效期:<p>{{item.effectiveDays > 0 ? item.effectiveDays+'天': '- -'}}</p></span>
+                                  </div>
+                                  <div>
+                                      <span>微信昵称:<p>{{item.nickName}}</p></span>
+                                  </div>
+                                  <div>
+                                      <span>状态:<p :style="{color: statusColorFn(item.status)}">{{item.status | stateExp}}</p></span>
+                                      <div class="operat">
+                                            <a class="upd" href="javascript: void(0);" v-if="item.status == 1" @click="UpdataOperationFn(item)">更新邀请码</a>
+                                            <a class="del" href="javascript: void(0);" @click="DeleteOperationFn(item)">删除</a>
+                                       </div>
+                                  </div>
+                            </div>
+                    </div>
                     <div v-else class="empty">
                         <img src="/img/common/empty.png">
                         <div class="msg"><p>暂无数据</p></div>

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

@@ -13,7 +13,7 @@
 <h1></h1>
 <!-- 我的采美 -->
 <div id="myGoods">
-    <div class="navLayout goods-container" v-show="isRequest" :class="isRequest ? 'active' : ''">
+    <div class="navLayout goods-container" v-cloak="">
         <div class="crumbs" v-if="isPC">
             <span>我的店铺</span>
             <span>&gt;</span>
@@ -37,7 +37,7 @@
                         </div>
                         <div class="form-row">
                             状态:
-                            <select name="" id="settlement-status" class="state" @change="SelectChangeStateFn($event)">
+                            <select name="" id="settlement-status" class="state " @change="SelectChangeStateFn($event)">
                                 <option value="">全部</option>
                                 <option value="1">待审核</option>
                                 <option value="8">审核未通过</option>
@@ -76,7 +76,7 @@
                     </form>
                 </div>
                 <div class="goods-main" v-if="productsList.length>0">
-                    <div class="goods-table" width="100%">
+                    <div class="goods-table" width="100%" v-if="isPC">
                         <ul class="goods-title">
                             <li>编号</li>
                             <li>商品主图</li>
@@ -112,6 +112,30 @@
                                         <p>/</p>
                                         <p>¥{{toFixedFn(product.price1)}}</p>
                                     </div>
+                                      <span v-if="promotions!=null" class="priceTag">
+                                          <i class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="promotions?promotions.name:''"></i>
+                                          <div class="promotion mFixed">
+                                                    <div>
+                                                        <p class="t">
+                                                            <em v-if="promotions.mode==2">{{promotions.name+',满 ¥'+toFloat(promotions.touchPrice)+' 减 ¥'+toFloat(promotions.reducedPrice)}}</em>
+                                                            <em v-if="promotions.mode==3">{{promotions.name+',满 ¥'+toFloat(promotions.touchPrice)+' 赠送商品'}}</em>
+                                                        </p>
+                                                        <p>促销时间:<em >不限时</em><em v-else>{{promotions.beginTime.substr(0,10)+' ~ '+promotions.endTime.substr(0,10)}}</em></p>
+                                                        <p v-if="promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+promotions.id">更多凑单商品>>></a></p>
+                                                        <template v-if="promotions.mode==3">
+                                                            <p>赠品:</p>
+                                                            <p>
+                                                                <span v-for="g in promotions.giftList" class="p">
+                                                                    <img :src="g.image">
+                                                                    <span v-text="g.name"></span>
+                                                                    <span v-text="'× '+g.number"></span>
+                                                                </span>
+                                                            </p>
+                                                        </template>
+                                                        <p class="c"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                                    </div>
+                                                </div>
+                                      </span>
                                 </li>
                                 <li>
                                     <p class="status" :style="{color: StatusColorFn(product.validFlag)}">
@@ -136,10 +160,60 @@
                             </ul>
                         </div>
                     </div>
+                   <div class="goods-table" width="100%" v-else>
+                        <div v-for="(product, index) in productsList" :key="index" class="table-list">
+                            <ul class="goods-title">
+                                 <li>商品主图:</li>
+                                  <li>
+                                    <div class="checkbox" @click='ischeck(product)'>
+                                        <span style="color: #22272e"> {{product.productID}}</span>
+                                        <div class="box icon mIcon":class="[product.productsChecked ?'icon-gouxuan':'icon-weigouxuan']"></div>
+                                    </div>
+                                </li>
+                            </ul>
+                            <div class="tbody">
+                                <div class="good-info">
+                                     <img :src="product.mainImage" :alt="product.name">
+                                     <p class="good-name">{{product.name}}</p>
+                                     <a class="btn eit" href="javascript: void(0);"
+                                      v-if="['0','1','2','3','8','9'].indexOf(product.validFlag)!=-1"
+                                           @click="editGoodFn(product)">编辑</a>
+                                </div>
+                                <div  class="good-price">
+                                    <span>市场价/售价:</span>
+                                     <p>¥{{toFixedFn(product.normalPrice)}}</p>
+                                     <p>/</p>
+                                     <p>¥{{toFixedFn(product.price1)}}</p>
+                                </div>
+                                <div class="good-status">
+                                    <div class="good-left">
+                                        <span>分类:</span>
+                                        <p class="good-classFly">{{product.typeName}}</p>
+                                    </div>
+                                    <div class="good-right">
+                                        <span>状态:</span>
+                                        <p class="status" :style="{color: StatusColorFn(product.validFlag)}">
+                                            {{StatusTextFn(product.validFlag)}}</p>
+                                    </div>
+                                </div>
+                                <div class="good-handle">
+                                        <a class="btn down" href="javascript: void(0);"
+                                           v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
+                                        <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured"
+                                           @click="AddPushHotFn(product)">添加主页推荐</a>
+                                        <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured"
+                                           @click="DeletePushHotFn(product)">删除主页推荐</a>
+                                        <a class="btn primary" href="javascript: void(0);"
+                                           v-if="['1','2'].indexOf(product.validFlag)!=-1"
+                                           @click="pageLinkDetils(product)">预览商品</a>
+                                    </div>
+                            </div>
+                          </div>
+                        </div>
                     <div class="good-footer">
                         <div class="footer-left">
                             <div class="checkbox" @click='checkedAll'>
-                                <div class="box icon"
+                                <div class="box icon mIcon"
                                      :class="[isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan']"></div>
                                 <span>全选</span>
                             </div>

+ 25 - 1
src/main/resources/templates/user-center/operation/list.html

@@ -46,7 +46,7 @@
                 </div>
                 <div class="container clear" v-else>
                     <!--数据为空-->
-                    <div class="section" v-if="operationList.length > 0">
+                    <div class="section" v-if="operationList.length > 0 && isPC">
                         <div class="title">
                             <div class="td td-1">姓名</div>
                             <div class="td td-2">手机号</div>
@@ -78,6 +78,30 @@
                             </div>
                         </div>
                     </div>
+                    <div class="section" v-if="operationList.length > 0&& !isPC">
+                            <div class="list"  v-for="(item, index) in operationList" :key="index">
+                                  <div class="list-one">
+                                      <span>姓名:<p>{{item.linkName}}</p></span>
+                                      <span>手机号:<p>{{item.mobile}}</p></span>
+                                      <span>邀请码:<p>{{item.invitationCode}}</p></span>
+                                  </div>
+                                  <div class="list-one">
+                                      <span>添加时间:<p>{{item.addTime}}</p></span>
+                                      <span>绑定时间:<p>{{item.bindTime}}</p></span>
+                                      <span>邀请码有效期:<p>{{item.effectiveDays > 0 ? item.effectiveDays+'天': '- -'}}</p></span>
+                                  </div>
+                                  <div>
+                                      <span>微信昵称:<p>{{item.nickName}}</p></span>
+                                  </div>
+                                  <div>
+                                      <span>状态:<p :style="{color: statusColorFn(item.status)}">{{item.status | stateExp}}</p></span>
+                                      <div class="operat">
+                                            <a class="upd" href="javascript: void(0);" v-if="item.status == 1" @click="UpdataOperationFn(item)">更新邀请码</a>
+                                            <a class="del" href="javascript: void(0);" @click="DeleteOperationFn(item)">删除</a>
+                                       </div>
+                                  </div>
+                            </div>
+                    </div>
                     <div v-else class="empty">
                         <img src="/img/common/empty.png">
                         <div class="msg"><p>暂无数据</p></div>