打款供应商

src/main/resources/static/css/user-center/order/detail.css

@@ -109,6 +109,7 @@ li{list-style:none}
     .section-botton .btn{width: 88px;height: 34px;border-radius: 2px;border: 1px solid #FFF;float: right;margin-left: 16px;font-size: 14px;line-height: 34px;text-align: center;display: block;}
     .section-botton .btn.cancel{border-color: #9aa5b5;background-color: #FFFFFF;color: #22272e;}
     .section-botton .btn.primary{border-color: #E15616;background-color: #E15616;color: #FFFFFF;}
+    .section-botton .btn.primary.confirm{line-height: 17px;}
     .section-botton .shopinfo{float: right;height: 100%;margin-right: 10px;}
     .section-botton .price-total{text-align: right;color: #22272e;font-size: 16px;float: right;padding-top: 0;line-height: 36px;}
     .section-botton.fiexd{position: fixed;bottom: 0;right: 0;}
@@ -175,7 +176,7 @@ li{list-style:none}
     .section-botton{margin-top:1.5vw}
     .section-botton .btn{display:block;width:93.4vw;height:11.2vw;line-height:11.2vw;font-size:3.7vw;text-align:center;background-color:#ffe6dc;border-radius:2px;border:1px solid #e15616;margin:0 auto 2.6vw auto;color:#e15616}
     .section-botton .primary{color:#FFF;Background:#e15616}
-
+    .section-botton .btn.primary.confirm{line-height: 4.5vw;}
 
 
 

src/main/resources/static/css/user-center/order/orderlist.css

@@ -59,12 +59,15 @@ li{list-style:none}
     .order-container .section .user-main .order-content{width: 100%;height: auto;float: left;}
     .order-container .section .user-main .order-content .order-item{width: 100%;height: 36px;float: left;}
     .order-container .section .user-main .order-content .order-item p{float: left;margin-right: 50px;line-height: 36px;color: #627386;font-size: 14px;}
+    .order-container .section .user-main .order-content .order-item p.confirm-text{float: right;color: #f94b4b;}
     .order-container .section .user-main .order-content .order-item p span{margin-left: 5px;color: #22272e;}
     .order-container .section .user-main .order-content .order-item p .red{color: #f94b4b;}
     .order-container .section .user-main .order-content .order-botton{width: 100%;height: 36px;float: left;margin-top: 8px;}
     .order-container .section .user-main .order-content .order-botton .btn{width: 88px;height: 34px;border-radius: 2px;border: 1px solid #FFF;float: right;margin-left: 16px;font-size: 14px;line-height: 34px;text-align: center;display: block;}
     .order-container .section .user-main .order-content .order-botton .btn.cancel{border-color: #9aa5b5;background-color: #FFFFFF;color: #22272e;}
     .order-container .section .user-main .order-content .order-botton .btn.primary{border-color: #E15616;background-color: #E15616;color: #FFFFFF;}
+    .order-container .section .user-main .order-content .order-botton .btn.primary.confirm{line-height: 15px;}
+    .order-container .section .user-main .order-content .order-botton .btn.primary.confirm p{line-height: 15px;}
     .order-container .section .user-main.product{height: 260px;padding: 20px 20px 10px 20px;}
     .order-container .section .user-main .product-item{width: 173px;height: auto;float: left;margin-right: 15px;cursor: pointer;}
     .order-container .section .user-main .product-item:last-child{margin-right: 0;}
@@ -121,8 +124,10 @@ li{list-style:none}
 .user-main.order .order-content span.red{color: #f94b4b;}
 .user-main.order .order-item p{display:inline-block;width:49%}
 .user-main.order .order-botton{text-align:right;margin-top:2vw}
-.user-main.order .order-botton .btn{display:inline-block;width:22.4vw;height:9.5vw;line-height:9.5vw;text-align:center;background-color:#ffe6dc;border-radius:2px;border:solid 1px #e15616;color:#e15616;font-size:3.4vw;margin-left:2.6vw}
+.user-main.order .order-botton .btn{display:inline-block;width:19.5vw;height:9.5vw;line-height:9.5vw;text-align:center;background-color:#ffe6dc;border-radius:2px;border:solid 1px #e15616;color:#e15616;font-size:3.4vw;margin-left:2.6vw;vertical-align: text-top}
 .user-main.order .order-botton .primary{background:#e15616;color:#FFF;}
+.order-container .section .user-main .order-content .order-botton .btn.primary.confirm{line-height: 4.5vw;}
+.order-container .section .user-main .order-content .order-botton .btn.primary.confirm p{line-height: 5vw;}
 input::placeholder{color: #9AA5B5}
 }
 

src/main/resources/static/js/common/serviceapi/order.service.js

@@ -130,4 +130,11 @@ var OrderApi = {
                 callback(res);
             });
         },
+        //  打款供应商
+        confirmpayment: function (params, callback) {
+            Http.AjaxService({ url:'/order/affirm/payment', type:'post', data:params, json:false})
+            .then(function(res){
+                callback(res);
+            });
+        },
 };

src/main/resources/static/js/supplier-center/operation/form.js

@@ -0,0 +1,55 @@
+;
+var operationPage = new Vue({
+    el: "#operationPage",
+    data: {
+        loginLoading: false,
+        userId: 0,
+        addForm: {
+            mobile: '',
+            linkName: '',
+            userID: '',
+            clubID: '',
+            configFlag: 2
+        },
+        rule: {
+            name: '^[a-zA-Z\\u4e00-\\u9fa5]{2,}$',
+            phone: '^\\d{6,12}$'
+        }
+    },
+    computed: {
+
+    },
+    methods: {
+        addConfirmFn:function(data){//添加运营人员
+            var _self = this;
+            var pass = verifyForm();
+            if (_self.loginLoading) { return false; }
+            if (!pass) {return false;}
+            _self.loginLoading = true;
+            UserApi.AddOperationUse(_self.addForm,function (response) {
+                if(response.code == 0 ){ //删除成功
+                    CAIMEI.dialog('添加成功',true,function () {
+                        window.location.href='/supplier/operation/list.html';
+                        _self.loginLoading = false;
+                    });
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                    _self.loginLoading = false;
+                }
+            })
+        },
+        blurHandle: function(event) { // 失去焦点校验
+            var el = event.currentTarget;
+            verifyHandle(el);
+        }
+    },
+    mounted: function () {
+        if(globalUserData){
+            this.addForm.userID = globalUserData.userId;
+            this.addForm.clubID = globalUserData.clubId;
+        }
+        $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
+        $('.navLayout').find('.navList').eq(1).addClass("on").find('.con').show().find('a').eq(1).addClass("on");
+
+    }
+});

src/main/resources/static/js/user-center/order/detail.js

@@ -83,6 +83,22 @@ var orderPage = new Vue({
                 }
             })
         },
+         hanldConfirmFn:function(userId,orderId){//确认打款供应商
+         var _self = this;
+            CAIMEI.Modal('确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？','取消','确定',function () {
+                 OrderApi.confirmpayment({orderID:orderId,userId:userId},function(response){
+                    if(response.code == 0){
+                         CAIMEI.dialog('确认成功',true,function () {
+                            _self.GetQueryOrderDetailsInfo();
+                        });
+                         _self.confirmFlag = true;
+                         _self.confrimsBtn = false;
+                    }else{
+                        CAIMEI.Alert(response.msg, '确定', false);
+                    }
+                })
+            })
+    },
         hanldConfirmOrderFn:function(){//确认订单
             var _self = this;
             CAIMEI.Modal('是否确认订单？','取消','确定',function () {

src/main/resources/static/js/user-center/order/list.js

@@ -34,7 +34,9 @@ var orderPage = new Vue({
         modelType:0,
         orderIdentificationId:0,
         payModelData:{},
-        hanldOrderData:{}//监听点击的单个订单项的按钮
+        hanldOrderData:{},//监听点击的单个订单项的按钮
+        confirmFlag:false,
+        confrimsBtn:true,
     },
     filters: {
         NumFormat:function(text) {//处理金额
@@ -94,6 +96,22 @@ var orderPage = new Vue({
         }
     },
     methods: {
+    hanldConfirmFn:function(userId,orderId){//确认打款供应商
+         var _self = this;
+            CAIMEI.Modal('确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？','取消','确定',function () {
+                 OrderApi.confirmpayment({orderID:orderId,userId:userId},function(response){
+                    if(response.code == 0){
+                        CAIMEI.dialog('确认成功',true,function () {
+                            _self.GetQueryOrderListData();
+                        });
+                         // _self.confirmFlag = true;
+                         // _self.confrimsBtn = false;
+                    }else{
+                        CAIMEI.Alert(response.msg, '确定', false);
+                    }
+                })
+            })
+    },
         toPagination: function (pageNum) {//点击切换分页
             if (pageNum <= this.pageTotal) {
                 this.listQuery.pageNum = pageNum;

src/main/resources/templates/supplier-center/operation/form.html

@@ -2,23 +2,71 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网--医疗美容生活美容正品采购平台</title>
+    <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/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/user-center/operation/form.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
-
-<!-- 我的采美 -->
-<div>
-
+<!-- 运营人员管理 -->
+<div id="operationPage">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" 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="order-header">
+                    <div class="header-bt">
+                        <div class="header-title">运营人员绑定步骤</div>
+                        <div class="header-button">
+                            <a class="btn-add" href="/supplier/operation/list.html">返回</a>
+                        </div>
+                    </div>
+                </div>
+                <div class="container clear">
+                    <div class="text">
+                        <p>1. 添加运营人员后，运营人员会收到一条邀请码短信</p>
+                        <p>2. 运营人员在微信搜索【采美采购商城】小程序，或者搜索关注【采美365】公众号，从底部菜单进入【采美采购商城】小程序</p>
+                        <p>3. 使用邀请码进行登录并绑定微信</p>
+                        <p>4. 绑定后，运营人员可通过微信直接登录采美365网</p>
+                    </div>
+                    <div class="form">
+                        <form>
+                            <div class="formLine">
+                                <p>姓名：</p>
+                                <input type="text" v-model.trim="addForm.linkName" placeholder="请输入运营人员姓名" :rule="rule.name" maxlength="8" @blur="blurHandle($event)" needverify>
+                                <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.trim="addForm.mobile" placeholder="请输入手机号码" :rule="rule.phone" maxlength="11" @blur="blurHandle($event)" needverify>
+                                <i class="checked icon mIcon"></i>
+                                <span class="errTips icon mIcon" tips="请输入有效的手机号码"></span>
+                            </div>
+                        </form>
+                    </div>
+                    <div class="button">
+                        <a href="javascript:void(0);" class="btn" @click="addConfirmFn" :class="loginLoading ? 'disabled' : ''">确定</a>
+                    </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/center.js(v=${version})}"></script>
-
+<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/supplier-center/operation/form.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -36,6 +36,7 @@
                         </div>
                         <div class="header-button">
                             <a class="btn-serch" href="javascript: void(0);" @click="searchOperationFn">搜索</a>
+                            <a class="btn-add" href="/supplier/operation/form.html">添加运营人员</a>
                         </div>
                     </div>
                 </div>

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

@@ -166,24 +166,24 @@
                                 <p>不要发票</p>
                             </div>
                         </div>
-                        <div class="section-payment shadow">
-                            <div class="payment-transfer">
-                                <div class="payment-transfer-main" id="paymentTransferMain">
-                                    <div class="label"><P class="label-title"><i class="icon mIcon"></i>除了线上支付，您还可以通过直接转账的方式付款</P></div>
-                                    <div class="label"><P class="label-t">转账信息</P></div>
-                                    <div class="label">
-                                        <P class="text">开户行：中信银行（深圳泰然支行）</P>
-                                        <P class="text">银行卡号：6217 6803 0362 0897</P>
-                                        <P class="text">户名：周仁声</P>
-                                    </div>
-                                    <div class="label">
-                                        <P class="text-p">订单标识：<span class="red">{{orderIdentificationId}}</span><a href="javascript: void(0);" class="copy" @click="copyOrderBtnSubmitFn">复制</a></P>
-                                    </div>
-                                    <div class="label"><P class="label-t">特别注意</P></div>
-                                    <div class="label"><P class="label-c">请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</P></div>
-                                </div>
-                            </div>
-                        </div>
+<!--                        <div class="section-payment shadow">-->
+<!--                            <div class="payment-transfer">-->
+<!--                                <div class="payment-transfer-main" id="paymentTransferMain">-->
+<!--                                    <div class="label"><P class="label-title"><i class="icon mIcon"></i>除了线上支付，您还可以通过直接转账的方式付款</P></div>-->
+<!--                                    <div class="label"><P class="label-t">转账信息</P></div>-->
+<!--                                    <div class="label">-->
+<!--                                        <P class="text">开户行：中信银行（深圳泰然支行）</P>-->
+<!--                                        <P class="text">银行卡号：6217 6803 0362 0897</P>-->
+<!--                                        <P class="text">户名：周仁声</P>-->
+<!--                                    </div>-->
+<!--                                    <div class="label">-->
+<!--                                        <P class="text-p">订单标识：<span class="red">{{orderIdentificationId}}</span><a href="javascript: void(0);" class="copy" @click="copyOrderBtnSubmitFn">复制</a></P>-->
+<!--                                    </div>-->
+<!--                                    <div class="label"><P class="label-t">特别注意</P></div>-->
+<!--                                    <div class="label"><P class="label-c">请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</P></div>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </div>-->
                         <div class="section-paymentlist shadow" v-if='orderInfo.receiptAmount>0' >
                             <div class="record-title mfbt">
                                 <div class="record-title-l">支付记录</div>
@@ -221,6 +221,7 @@
                         </div>
                         <div class="section-botton shadow" :class="isFiexd ? 'fiexd' : 'float'">
                             <div class="inner">
+                                <a class="btn primary confirm" href="javascript: void(0);" v-if="orderInfo.affirmPaymentFlag=='00'" @click="hanldConfirmFn(orderInfo.userID,orderInfo.orderID)"><p>确认</p>打款供应商</a>
                                 <a class="btn primary" href="javascript: void(0);" v-if="['11','12','13','21','22','23','111'].indexOf(orderInfo.status)!=-1" @click="hanldPayOrderFn()">支付订单</a>
                                 <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(orderInfo.status)!=-1" @click="hanldCancelOrderFn()">取消订单</a>
                                 <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(orderInfo.status)!=-1"  @click="hanldConfirmOrderFn()">确认订单</a>
@@ -228,7 +229,7 @@
                                 <a class="btn cancel" href="javascript: void(0);"  v-if="['4','5','12','13','33','22','23','32','77'].indexOf(orderInfo.status)!=-1" @click="hanldQueryExpressFn()">查看物流</a>
                                 <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(orderInfo.status)!=-1" @click="hanldReceivingOrderFn()">确认收货</a>
                                 <div class="shopinfo" v-if="['11','12','13','21','22','23','111'].indexOf(orderInfo.status)!=-1">
-                                    <p class="price-total">待付金额：<span class="red">￥{{orderInfo.pendingPayments | NumFormat}}</span> </p>
+                                    <p class="price-total" v-if="orderInfo.pendingPayments!=0">待付金额：<span class="red">￥{{orderInfo.pendingPayments | NumFormat}}</span> </p>
                                 </div>
                             </div>
                         </div>

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

@@ -88,6 +88,7 @@
                                     <p v-if="order.discountFee!=0">经理折扣：<span>￥{{order.discountFee | NumFormat}}</span> </p>
                                     <p>促销满减：<span>￥{{order.promotionFullReduction | NumFormat}}</span> </p>
                                     <p>赠品数：<span>{{order.presentCount + order.promotionalGiftsCount}}</span></p>
+                                    <p class="confirm-text" v-if="confirmFlag">已确认打款供应商</p>
                                 </div>
                                 <div class="order-item">
                                     <p>订单总额：<span class="red">￥{{order.payTotalFee | NumFormat}}</span> </p>
@@ -98,13 +99,14 @@
                                     <p>待付金额：<span class="red">￥{{order.pendingPayments | NumFormat}}</span> </p>
                                 </div>
                                 <div class="order-botton">
+                                    <a class="btn primary confirm" href="javascript: void(0);" v-if="order.affirmPaymentFlag=='00'" @click="hanldConfirmFn(order.userID,order.orderID)"><p>确认</p>打款供应商</a>
                                     <a class="btn primary" href="javascript: void(0);" v-if="['11','12','13','21','22','23','111'].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order,order.orderID)">支付订单</a>
                                     <a class="btn cancel" href="javascript: void(0);" @click="hanldDetilsOrderFn(order.orderID)">订单详情</a>
                                     <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(order.status)!=-1" @click="hanldCancelOrderFn(order.orderID)">取消订单</a>
                                     <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(order.status)!=-1"  @click="hanldConfirmOrderFn(order.orderID)">确认订单</a>
                                     <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(order.status)!=-1" @click="hanldDeleteOrderFn(order.orderID)">删除订单</a>
-                                    <a class="btn cancel" href="javascript: void(0);"  v-if="['4','5','12','13','33','22','23','32','77'].indexOf(order.status)!=-1" @click="hanldQueryExpressFn(order.orderID)">查看物流</a>
-                                    <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(order.status)!=-1" @click="hanldReceivingOrderFn(order.orderID)">确认收货</a>
+                                    <a class="btn cancel" href="javascript: void(0);"  v-if="['4','5','12','13','33','22','23','32','77'].indexOf(order.status)!=-1 && order.secondHandOrderFlag !=1" @click="hanldQueryExpressFn(order.orderID)">查看物流</a>
+                                    <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(order.status)!=-1 && order.secondHandOrderFlag !=1" @click="hanldReceivingOrderFn(order.orderID)">确认收货</a>
                                 </div>
                             </div>
                         </div>