浏览代码

收银台优化,供应商我的商品增加已隐身字段,自由页面优化

zhengjinyi 4 年之前
父节点
当前提交
2f4940ecf9

+ 4 - 0
src/main/resources/static/css/flea-market/list.css

@@ -91,4 +91,8 @@
     .fabu a .mIcon{width: 4.6vw;height: 4.6vw;display: block;margin: 0 auto;}
     .fabu a .mIcon:before{width: 4.6vw;height: 4.6vw;display: block;background-position: -93vw -53vw;}
     .fabu a p{line-height: 4.2vw;text-align: center;margin-top: 1vw;}
+    .scroll-load{width: 100%;padding: 2vw 0;}
+    .scroll-load .icon-load{width:20vw;margin:  0 auto;}
+    .scroll-load .icon-load img{float: left;display: inline-block;margin-right: 2vw;}
+    .scroll-load .icon-load span{font-size: 2.8vw;color: #999999;}
 }

+ 35 - 2
src/main/resources/static/css/pay/caimei-paymobile.css

@@ -59,7 +59,40 @@
 * 移动端
 */
 @media screen and (max-width:768px){
-
-
+    body{min-width: 100%;background-color: #FFFFFF;}
+    footer{display: none;}
+    .head-wrap{width: 100%;height: 16vw;border: 1px solid #EBEBEB;}
+    .head-wrap .inner{width: 35vw;height: 16vw;}
+    .head-wrap .logo{width:13.6vw;height: 16vw;float: left;}
+    .head-wrap .logo a{width:13.6vw;height: 16vw;display: block;}
+    .head-wrap .logo a img{width:13.6vw;height: 16vw;display: block;}
+    .head-wrap .text{height: 16vw;float: left;margin-left: 10px;line-height: 16vw;font-size: 6vw;color: #333333;}
+    .pay-container {width: 100%;min-height: 100%;position: relative;margin-bottom: 0;}
+    .pay-container .container{opacity:0;}
+    .pay-container .container.active{opacity: 1;}
+    .pay-content{width: 100%;margin: 0 auto;height:100%;margin-top: 0;background: #FFFFFF;box-sizing: border-box;padding: 0;}
+    .pay-content.weixin{border: none;}
+    .pay-content.ali{border: none;}
+    .pay-codecontent{width: 100%;height: auto;float: left;padding:  0 2.4vw;box-sizing: border-box;}
+    .pay-codecontent .pay-amount{width:  100%;height: auto;float: left;}
+    .pay-codecontent .pay-amount .pay-amount-text{width: 100%;height: auto;float: left;margin-bottom: 4vw;}
+    .pay-codecontent .pay-amount .pay-amount-text p{font-size: 4vw;text-align: center;color: #333;line-height: 8vw;}
+    .pay-codecontent .pay-amount .pay-amount-text p span{margin-left: 5px;}
+    .pay-codecontent .pay-amount .pay-amount-icon{display: none;}
+    .pay-codecontent .pay-codemain{width: 100%;height: auto;float: right;position: relative;}
+    .pay-codecontent .pay-codemain .code-title{width: 100%;height:8vw;line-height:8vw;font-size: 4vw;color: #333333;margin-bottom: 20px;text-align: center;font-weight: bold;}
+    .pay-codecontent .pay-codemain .code-title span{color: #E15616;}
+    .pay-codecontent .pay-codemain .pay-qrCode{width: 220px;height: 220px;position: relative;margin: 0 auto;padding: 8px;border: 2px solid #ebebeb;}
+    .pay-codecontent .pay-codemain .pay-qrCode.weixin{border-color:#7AD237 ;}
+    .pay-codecontent .pay-codemain .pay-qrCode.ali{border-color:#26A1EE ;}
+    .pay-codecontent .pay-codemain .pay-qrCode i{width: 48px;height: 48px;display: block;position: absolute;top: 0;left: 0;right: 0;bottom: 0;margin: auto;}
+    .pay-codecontent .pay-codemain .pay-qrCode .icon-alipay{background: url("/img/pay/icon-ali@2x.png")no-repeat;background-size: contain;}
+    .pay-codecontent .pay-codemain .pay-qrCode .icon-wechat{background: url("/img/pay/icon-wechatpay@2x.png")no-repeat;background-size: contain;}
+    .pay-codecontent .pay-codemain .code-footer{width: 100%;height: 33px;line-height: 33px;font-size: 14px;color: #333333;text-align: center;margin-top: 10vw;}
+    .pay-codecontent .pay-codemain .code-footer .code-img{width: 84px;height: 28px;display: block;margin: 0 auto;}
+    .pay-codemain .model{position: absolute;width: 240px;height: 240px;top: 54px;left:18vw;display: flex;justify-content: center;align-items: center;background: rgba(255,255,255,1);color: #999;z-index: 99999;border: 1px solid #EBEBEB;}
+    .pay-codemain .model .refresh{width: 21px;height: 21px;display: block;margin: 0 auto;margin-bottom: 3px;}
+    .pay-codemain .model  .refresh-div{width: 100px;height: auto;display: block;}
+    .pay-codemain .model  .refresh-div p{text-align: center;font-size: 14px;line-height: 20px;}
 
 }

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

@@ -45,6 +45,7 @@ li{list-style:none}
     .order-container .section-shopinfo .product-t .tit{float: left;width: 100%;margin-bottom: 6px;line-height: 22px;font-size: 16px;text-align: left;color: #22272E;}
     .order-container .section-shopinfo .product-t .info{width: 100%;height: auto;float: left;}
     .order-container .section-shopinfo .product-t .info>p{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:30%}
+    .order-container .section-shopinfo .product-t .info>p .red{color: #FF2A2A;}
     .order-container .section-shopinfo .product-t .price>p{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:30%}
     .order-container .section-shopinfo .product-t .price>p .red{color: #FF2A2A;}
     .price-total{padding-top:20px;text-align:right;color:#22272e;font-size:16px}
@@ -146,6 +147,7 @@ li{list-style:none}
     .section-prosinfo .text .info{position:relative}
     .section-prosinfo .text .info .priceTag .tag{position:absolute;right:0;top:auto;left:auto;}
     .section-prosinfo .text .info>p{display:inline-block;min-width:48%;font-size:3.1vw;color:#627386}
+    .section-prosinfo .text .info>p .red{color:#FF2A2A}
     .section-prosinfo .text .price{font-size:3.4vw;color:#627386}
     .section-prosinfo .text .price .red{color:#f94b4b}
     .shopinfo-bott{border-top:1px solid #F7F7F7;width:100%;box-sizing:border-box;margin:0 auto;line-height:10.6vw;color:#22272e;font-size:3.4vw;text-align:right;padding:0 3.2vw}

二进制
src/main/resources/static/img/base/icon-loading.gif


+ 3 - 3
src/main/resources/static/js/base.js

@@ -100,11 +100,9 @@ var globalHead = new Vue({
             window.location.href='/product-'+id+'.html';
         },
         DeleteCartProducts:function(id){  // 删除购物车
-            console.log(id);
             var _self = this;
             ShoppingApi.DeleteCartProducts({userID: this.userData.userId, productIDs: id},function(response){
                 if(response.code === 0){
-                    console.log('2222222222222222')
                     _self.getHeadCart(_self.userData.userId);
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
@@ -530,7 +528,9 @@ function tokenAjax(type, url, params, callback, errorBack){
             }
         },
         error : function (res) {
-           alertInfo("网络连接超时,请重试!",errorBack);
+           alertInfo("网络连接超时,请重试!",function (res) {
+               console.log(res)
+           });
         }
     });
 }

+ 7 - 1
src/main/resources/static/js/flea-market/list.js

@@ -31,6 +31,7 @@ var fleaMarketList = new Vue({
           listRecord: 0,
           pageInput: '1',
           params:{},
+          isScroll:false,
           noMore:false,
           hasNextPage:false
      },
@@ -116,6 +117,7 @@ var fleaMarketList = new Vue({
                                    _this.tabchildList = data.results;
                                }else{
                                    if(more){
+                                       _this.isScroll = false;
                                        _this.tabchildList = _this.tabchildList.concat(data.results);
                                    }else{
                                        _this.tabchildList = data.results;
@@ -168,7 +170,11 @@ var fleaMarketList = new Vue({
                     if(next <= totalPage){
                         if (_this.requestFlag){
                             _this.listQuery.pageNum = next;
-                            _this.gettabList(true);
+                            _this.isScroll = true;
+                            setTimeout(function(){
+                                _this.gettabList(true);
+                            },500)
+
                         }
                         _this.requestFlag = false;
                     }else{

+ 61 - 25
src/main/resources/static/js/pay/caimei-paycash.js

@@ -6,7 +6,7 @@ var payContainer = new Vue({
     data: {
         isSubMitStatus:false,
         payInfo:{
-            PAY_BANK_NUM: 'ALIPAY', //支付类型
+            PAY_BANK_NUM: '', //支付类型
             PAY_ORDERID: '',  //订单ID
             PAY_UNPAIDAMOUNT: '', //待支付金额
             PAY_PAYAMOUNT: 0,//本次支付金额
@@ -51,7 +51,7 @@ var payContainer = new Vue({
         discernReceiptList:[],//支付记录列表
         tabIndex:0,//支付方式 0 移动支付 1网银支付 2线下转账
         mbOrderId:'',//支付订单ID
-        mobileTabIndex:0,
+        mobileTabIndex:null,
         bankTabIndex:0,
         isRequest:false,
         isPayAlert:false,
@@ -64,7 +64,8 @@ var payContainer = new Vue({
         isReceiptStatus:false,
         onlinePayFlag:'',
         payStatusText:'使用微信和企业网银支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。',
-        productID:''//发布商品的ID
+        productID:'',//发布商品的ID
+        is_Wechat_bowcr:false
     },
     filters: {
         NumFormat:function(value) {
@@ -167,26 +168,48 @@ var payContainer = new Vue({
                     return;
                 }
                 if(_self.payInfo.PAY_BANK_NUM == "WEIXIN"){
+
                     if(_self.pageType === '1'){
-                        _self.payInfo.PAY_DATA = {//二手
-                            type:_self.payInfo.PAY_BANK_NUM,
-                            productId:_self.productID,
-                            amount:_self.payAmount,
-                            url:_self.payInfo.PAY_MOBILE_URL
-                        };
-                        CAIMEI.Storage.setItem('PAY_DATA',JSON.stringify(_self.payInfo.PAY_DATA));
-                        window.open("/pay/caimei-paymobile.html?pageType=1");
-                        _self.isPayAlert = true;
+                        if(!isPC){
+                            var orderInfo = {//二手微信二维码参数
+                                    pageType:1,
+                                    productId:_self.productID,
+                                    payAmount:_self.payAmount
+                            };
+                            _self.payInfo.PAY_MOBILE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea43a0f9ebce9e66&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
+                            location.href = _self.payInfo.PAY_MOBILE_URL;
+                        }else{
+                            _self.payInfo.PAY_DATA = {//二手
+                                type:_self.payInfo.PAY_BANK_NUM,
+                                productId:_self.productID,
+                                amount:_self.payAmount,
+                                url:_self.payInfo.PAY_MOBILE_URL
+                            };
+                            CAIMEI.Storage.setItem('PAY_DATA',JSON.stringify(_self.payInfo.PAY_DATA));
+                            window.open("/pay/caimei-paymobile.html?pageType=1");
+                            _self.isPayAlert = true;
+                        }
                     }else{
-                        _self.payInfo.PAY_DATA = {//正常订单
-                            type:_self.payInfo.PAY_BANK_NUM,
-                            orderid:_self.payInfo.PAY_ORDERID,
-                            amount:_self.payAmount,
-                            url:_self.payInfo.PAY_MOBILE_URL
-                        };
-                        CAIMEI.Storage.setItem('PAY_DATA',JSON.stringify(_self.payInfo.PAY_DATA));
-                        window.open("/pay/caimei-paymobile.html");
-                        _self.isPayAlert = true;
+                        if(!isPC){
+                            var orderInfo = {//普通订单微信二维码参数
+                                    pageType:0,
+                                    orderID:_self.payInfo.PAY_ORDERID,
+                                    payAmount:_self.payAmount
+                            };
+                            console.log(orderInfo)
+                            _self.payInfo.PAY_MOBILE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea43a0f9ebce9e66&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
+                            location.href = _self.payInfo.PAY_MOBILE_URL;
+                        }else{
+                            _self.payInfo.PAY_DATA = {//正常订单
+                                type:_self.payInfo.PAY_BANK_NUM,
+                                orderid:_self.payInfo.PAY_ORDERID,
+                                amount:_self.payAmount,
+                                url:_self.payInfo.PAY_MOBILE_URL
+                            };
+                            CAIMEI.Storage.setItem('PAY_DATA',JSON.stringify(_self.payInfo.PAY_DATA));
+                            window.open("/pay/caimei-paymobile.html?pageType=1");
+                            _self.isPayAlert = true;
+                        }
                     }
                 }else{
                     if(_self.pageType === '1'){
@@ -260,7 +283,11 @@ var payContainer = new Vue({
                             url:_self.payInfo.PAY_MOBILE_URL
                         };
                         CAIMEI.Storage.setItem('PAY_DATA',JSON.stringify(_self.payInfo.PAY_DATA));
-                        window.open("/pay/caimei-paymobile.html?pageType=1");
+                        if(!isPC){
+                            location.href = _self.payInfo.PAY_MOBILE_URL;
+                        }else{
+                            window.open("/pay/caimei-paymobile.html?pageType=1");
+                        }
                     }else{
                         window.open(response.data.data.payUrl);
                     }
@@ -344,9 +371,9 @@ var payContainer = new Vue({
                     break;
             }
         },
-        checkMobilePay:function(index,item){//选择移动支付方式
+        checkMobilePay:function(index,bankNum){//选择移动支付方式
             this.mobileTabIndex = index;
-            this.payInfo.PAY_BANK_NUM = item.bankNum;
+            this.payInfo.PAY_BANK_NUM = bankNum;
             if( this.mobileTabIndex==2){
 
             }
@@ -476,7 +503,16 @@ var payContainer = new Vue({
             }
             _self.infoPayOrderCheckoutCounter();//正常订单初始化
         }
-
+        var viewer = window.navigator.userAgent.toLowerCase();
+        if(viewer.match(/MicroMessenger/i) == 'micromessenger'){
+            _self.is_Wechat_bowcr = true;
+            _self.payInfo.PAY_BANK_NUM = 'WEIXIN';
+            _self.mobileTabIndex = 1;
+        }else{
+            _self.is_Wechat_bowcr = false;
+            _self.payInfo.PAY_BANK_NUM = 'ALIPAY';
+            _self.mobileTabIndex = 0;
+        }
 
     }
 });

+ 18 - 0
src/main/resources/static/js/single-page/page.js

@@ -0,0 +1,18 @@
+var freePage = new Vue({
+    el: "#freePage",
+    data: {
+
+    },
+    computed: {
+
+    },
+    methods: {
+
+    },
+    created: function () {
+
+    },
+    mounted: function () {
+        var _self = this;
+    }
+});

+ 1 - 0
src/main/resources/static/js/supplier-center/shop/goods.js

@@ -373,6 +373,7 @@ var myGoods = new Vue({
                     '1':'待审核',
                     '8':'审核未通过',
                     '9':'已冻结',
+                    '10':'已隐身',
                     '0':'已删除'
                 };
             Object.keys(stateTextObject).forEach(function(key) {

+ 0 - 2
src/main/resources/static/js/supplier/index.js

@@ -102,7 +102,6 @@ var supplierHome = new Vue({
                 if (r.code === 0 && r.data) {
                     var result = JSON.parse(r.data);
                     _self.listRecord = result.total;
-                    console.log(result)
                     var resultData = setSearchProductList(result.items, _self.userId, function(){
                         _self.$forceUpdate();
                         setTimeout(function(){
@@ -111,7 +110,6 @@ var supplierHome = new Vue({
                         },500);
                     });
                     _self.productLists = _self.productLists.concat(resultData);
-                    console.log( _self.productLists)
                 }
                 _self.requestFlag = true;
             })

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

@@ -24,6 +24,15 @@ var orderPage = new Vue({
             if(n>100){num = 99}else{num = n;}
             return num;
         },
+        formatIncludedTax:function(value) {
+            if (value === '1') {
+                return '不含税 ';
+            } else if (value === '2') {
+                return '含税';
+            } else {
+                return '';
+            }
+        },
         stateExp:function (state){ //订单状态文字和颜色
             var stateText = '',
                 stateTextObject={

+ 217 - 0
src/main/resources/static/lib/js/publicMobile.js

@@ -0,0 +1,217 @@
+$(function () {
+    if($('body').attr('data-type') =='NewIndex'){
+        $(function () {
+            (function (w) {
+                setSize();
+                function setSize() {
+                    var vWidth = (w.document.documentElement.getBoundingClientRect().width > 750) ? 750 : w.document.documentElement
+                            .getBoundingClientRect().width;
+                    w.document.documentElement.style.fontSize = vWidth / 7.5 + "px";
+                }
+                window.onresize = function () {
+                    setSize();
+                }
+            })(window);
+//        document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + 'px';
+        })
+    }else {
+        (function (doc, win) {
+            var docEl = doc.documentElement,
+                resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
+                recalc = function () {
+                    var clientWidth = docEl.clientWidth;
+                    if (!clientWidth) return;
+                    /* docEl.style.fontSize = 20 * ( clientWidth / 320 ) + 'px'; */
+                    docEl.style.fontSize = (20 * ( clientWidth / 320 ) > 32 ? 32 : 20 * ( clientWidth / 320 )) + 'px';
+                };
+            recalc();
+            if (!doc.addEventListener) return;
+            win.addEventListener(resizeEvt, recalc, false);
+            doc.addEventListener('DOMContentLoaded', recalc, false);
+        })(document, window);
+    }
+});
+
+
+
+$(function () {
+    function bigimg(imgdiv) {
+        //点击图片放大
+        imgdiv.on('click',function(){
+            var urls=[];
+            var imgList = imgdiv;
+            imgList.each(function(i){
+                urls.push(imgList.eq(i).attr('src'));
+            });
+            WeixinJSBridge.invoke('imagePreview', {
+                'current':server + $(this).attr('src'),
+                'urls': urls
+            });
+        });
+
+    };
+    function getCookie(cname) {
+        console.log(cname)
+        var name = cname + "=";
+        var ca = document.cookie.split(';');
+        for(var i=0; i<ca.length; i++)
+        {
+            var c = ca[i].trim();
+            if (c.indexOf(name)==0) return c.substring(name.length,c.length);
+        }
+        return "";
+    }
+    var _cibe = getCookie("cibe");
+    if(_cibe ==1){
+        $("body").append('<div class="mbh-img" style="position: fixed;right: 10%;bottom: 10%;width: 4rem;height: 4rem;cursor: pointer"> <img style="width: 100%;height: 100%;" src="/html/cibe/img/mbh.png"> </div>');
+    }
+    $("body").on("click",".mbh-img",function () {
+        setCookie("cibe","",-1);
+        window.location.href='/html/cibe/view/placeholder.jsp';
+        // document.cookie = "username=; expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/";
+    });
+//存储cookie
+    function setCookie(cname,cvalue,exmin)
+    {
+        var d = new Date();
+        d.setTime(d.getTime()+(exmin*60*1000));
+        var expires = "expires="+d.toGMTString();
+        document.cookie = cname + "=" + cvalue + "; " + expires+";path=/";
+    }
+})
+
+//前端适配
+// var _link = window.location.href;
+// if(_link.indexOf("/html/cmpage/view") != -1){//暂时注释因为木有数据
+//     if(_link.indexOf("=") != -1){
+//         var _url = _link.split('='),//链接第一个参数是页面类型,第二个参数是页面ID
+//             _type = _url[1].split("&")[0],
+//             _id = _url[2];
+//     }
+//     if(_type ==1){
+//         _link = wwwServe+'/cmpage/info-'+ _type +'-'+ _id +'.html';
+//         browserRedirect(_link);
+//     }else if(_type ==2) {
+//         _link = wwwServe+'/cmpage/info-'+ _type +'-'+ _id +'.html';
+//         browserRedirect(_link);
+//     }
+// }else if(_link.indexOf("/product/cmbeanDetail.action") != -1){//商品详情采美豆
+//     var productID =_link.split('productID=')[1];
+//     _link = wwwServe+'/cmbean/product-'+productID+'-1.html';
+//     browserRedirect(_link);
+// }else if(_link.indexOf("/product/productDetail.action") != -1){//普通
+//     var productID =_link.split('productID=')[1];
+//     _link = wwwServe+'/product-'+productID+'.html';
+//     browserRedirect(_link);
+// }else if(_link == 'http://crm.caimei365.com/cmpage/index.rpc'|| _link == "http://crmtest.365mdd.com/cmpage/index.rpc"){
+//     _link = wwwServe;
+//     browserRedirect(_link);
+// }else if(_link.indexOf("/html/cmBeans/view/cmBeans.jsp") > -1){
+//     if(_link.indexOf("=") != -1){
+//         var _url = _link.split('=')[1];//链接第一个参数是页面类型,第二个参数是页面ID
+//     }
+//     _link = wwwServe+'/cmBeans/search/list-'+_url+'.html';
+//     browserRedirect(_link);
+// }else if(_link.lastIndexOf("/product/list.action") != -1){//商品搜索list
+//     var _url = _link.split('bigTypeId=');
+//     var bigTypeID = _url[1].split('&smallTypeId')[0];//0
+//     var smallTypeID = _url[1].split('&smallTypeId=')[1].split('&tinyTypeId')[0];//0
+//     var tinyTypeID = _url[1].split('&smallTypeId=')[1].split('&tinyTypeId=')[1].split('&sortType=')[0];//0
+//     var sortType = _url[1].split('&smallTypeId=')[1].split('&tinyTypeId=')[1].split('&sortType=')[1].split('&shopID=')[0];
+//     var wd;
+//     if(_link.lastIndexOf('keyWord') > -1){
+//         var shopID = _url[1].split('&smallTypeId=')[1].split('&tinyTypeId=')[1].split('&sortType=')[1].split('&shopID=')[1].split('&keyWord=')[0];
+//         if (_link.lastIndexOf('searchTypeID') > -1) {
+//             wd = _link.split('&keyWord=')[1].split('&searchTypeID')[0];
+//             var searchTypeID = _link.split('searchTypeID=')[1];
+//             _link = wwwServe+'/product/search/list/' + bigTypeID + '-' + smallTypeID + '-' + tinyTypeID + '-' + sortType + '-' + shopID + '.html?wd='+ wd +'&searchTypeID=' +searchTypeID;
+//         }else{
+//             wd = _link.split('&keyWord=')[1];
+//             _link = wwwServe+'/product/search/list/' + bigTypeID + '-' + smallTypeID + '-' + tinyTypeID + '-' + sortType + '-' + shopID + '.html?wd='+ wd;
+//         }
+//         browserRedirect(_link);
+//     }else {
+//         var shopID = _url[1].split('&smallTypeId=')[1].split('&tinyTypeId=')[1].split('&sortType=')[1].split('&shopID=')[1];
+//         if (_link.lastIndexOf('searchTypeID') > -1) {
+//             var searchTypeID = _link.split('searchTypeID=')[1];
+//             _link = wwwServe+'/product/search/list/' + bigTypeID + '-' + smallTypeID + '-' + tinyTypeID + '-' + sortType + '-' + shopID + '.html?searchTypeID=' +searchTypeID;
+//         }else{
+//             _link = wwwServe+'/product/search/list/' + bigTypeID + '-' + smallTypeID + '-' + tinyTypeID + '-' + sortType + '-' + shopID + '.html';
+//         }
+//         browserRedirect(_link);
+//     }
+// }
+//
+//
+// function browserRedirect(link) {
+//
+//     var sUserAgent= navigator.userAgent.toLowerCase();
+//
+//     var bIsIpad= sUserAgent.match(/ipad/i) == "ipad";
+//
+//     var bIsIphoneOs= sUserAgent.match(/iphone os/i) == "iphone os";
+//
+//     var bIsMidp= sUserAgent.match(/midp/i) == "midp";
+//
+//     var bIsUc7= sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
+//
+//     var bIsUc= sUserAgent.match(/ucweb/i) == "ucweb";
+//
+//     var bIsAndroid= sUserAgent.match(/android/i) == "android";
+//
+//     var bIsCE= sUserAgent.match(/windows ce/i) == "windows ce";
+//
+//     var bIsWM= sUserAgent.match(/windows mobile/i) == "windows mobile";
+//
+//     if (bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM) {
+//         console.log('啥都不干!!!!!');
+//     }else {
+//         // var _link = window.location.href;
+//         // if(_link.indexOf("/html/cmpage/view") != -1){//暂时注释因为木有数据
+//         //     var _url = _link.split('='),//链接第一个参数是页面类型,第二个参数是页面ID
+//         //         _type = _url[1].split("&")[0],
+//         //         _id = _url[2];
+//         //     if(_type ==1){
+//         //         _link = wwwServe+'/cmpage/info-'+ _type +'-'+ _id +'.html';
+//         //     }else if(_type ==2) {
+//         //         _link = wwwServe+'/cmpage/info-'+ _type +'-'+ _id +'.html';
+//         //     }
+//         // }
+//         // else
+//             // if(){//商品搜索list
+//             // _link.lastIndexOf("/product/list.action") != -1
+//             // var _url = _link.split('bigTypeId=');
+//             // var bigTypeID = _url[1].split('&smallTypeId')[0];
+//             // var smallTypeID = _url[1].split('&smallTypeId=')[1].split('&tinyTypeId')[0];
+//             // var tinyTypeID = _url[1].split('&smallTypeId=')[1].split('&tinyTypeId=')[1];
+//             //
+//             // // var sortType = _url[3];
+//             // // var shopID = _url[4].split('.html')[0];
+//             // var wd;
+//             // if(_link.lastIndexOf('?') > -1){
+//             //     wd = _link.split('?')[1];
+//             //     if (wd.lastIndexOf('wd=') > -1) {
+//             //         wd = wd.replace('wd=', 'keyWord=');
+//             //     }
+//             // }
+//             // _link = wwwServe+'/product/search/list/' + bigTypeID + '-' + smallTypeID + '-' + tinyTypeID + '-0-0.html';
+//             //
+//             // if(wd){
+//             //     _link+='&' + wd;
+//             // }
+//
+//         // }
+//         // else if(_link.indexOf("/product/productDetail") > -1){//商品详情
+//         //     var productID =_link.split('productID=')[1];
+//         //     _link = wwwServe+'/product-'+productID+'.html';
+//         //
+//         //
+//         // }else if(_link.indexOf("/cmpage/index") > -1){
+//         //
+//         //     _link = wwwServe;
+//         // }
+//
+//         window.location.href= link;
+//
+//     }
+// };

+ 6 - 0
src/main/resources/templates/flea-market/list.html

@@ -98,6 +98,12 @@
                  <p>我要发布</p>
              </a>
         </div>
+        <div v-if="(!isPC) && isScroll" class="scroll-load">
+            <div class="icon-load">
+                <img src="/img/base/icon-loading.gif" alt="">
+                <span>加载中~</span>
+            </div>
+        </div>
         <div v-if="(!isPC) && !hasNextPage" class="noMore">----  没有更多了 ----</div>
     </div>
     <div class="pageWrap clear" v-if="isPC">

+ 13 - 4
src/main/resources/templates/pay/caimei-paycash.html

@@ -74,12 +74,21 @@
                         <div class="payment-title">{{payStatusText}}</div>
                         <div class="pay-bank">
                             <div class="bank-list" id="mobileContent">
-                                <a href="javascript:void(0);" class="bank-a mIcon" v-for="(item, index) in mobileData" :key="index" @click="checkMobilePay(index,item)" :class="{ active: mobileTabIndex === index }">
-                                    <img :src="item.imgUrl" :alt="item.bankName">
+                                <a v-if="!is_Wechat_bowcr" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(0,'ALIPAY')" :class="{ active: mobileTabIndex === 0 }">
+                                    <img src="/img/pay/iconbank-ali@2x.png" alt="支付宝支付">
+                                </a>
+                                <a v-if="is_Wechat_bowcr && !isPC" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(1,'WEIXIN')" :class="{ active: mobileTabIndex === 1 }">
+                                    <img src="/img/pay/iconbank-wx@2x.png" alt="微信支付">
+                                </a>
+                                <a v-if="isPC" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(1,'WEIXIN')" :class="{ active: mobileTabIndex === 1 }">
+                                    <img src="/img/pay/iconbank-wx@2x.png" alt="微信支付">
+                                </a>
+                                <a href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(2,'ICBC_B2B')" :class="{ active: mobileTabIndex === 2 }">
+                                    <img src="/img/pay/iconbank-bank@2x.png" alt="网银支付">
                                 </a>
                             </div>
                         </div>
-                        <div class="pay-bank"  v-if="mobileTabIndex === 2">
+                        <div class="pay-bank"  v-if="mobileTabIndex === 2 && isPC">
                             <div class="bank-list mfw" id="bankContent">
                                 <a href="javascript:void(0);" class="bank-b mIcon" v-for="(item, index) in bankData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
                                     <img :src="item.imgUrl" :alt="item.bankName">
@@ -116,7 +125,7 @@
     <div class="pay-button-main">
         <div class="inner">
             <div class="pay-button" v-if="mobileTabIndex === 2">
-                <a href="javascript:void(0);" id="paySubmit" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''">立即支付</a>
+                <a v-show="isPC" href="javascript:void(0);" id="paySubmit" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''">立即支付</a>
             </div>
             <div class="pay-button" v-else>
                 <a href="javascript:void(0);" id="payMobileSubmit" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''">立即支付</a>

+ 9 - 3
src/main/resources/templates/single-page/page.html

@@ -15,6 +15,7 @@
         }
         /** 移动端 */
         @media screen and (max-width:768px){
+            header,footer{display: none;}
             .freePage{width:100vw;margin:0 auto;text-align:center;}
             .freePage img {max-width:100%;height:auto !important;}
             .freePage table{width:100%;text-align:left}
@@ -27,13 +28,18 @@
 
 <!-- 自由页面 -->
 <div id="freePage">
-
-    <div class="freePage" th:utext="${pageData.content}"></div>
-
+    <template v-if="isPC">
+        <div class="freePage" th:utext="${pageData.content}"></div>
+    </template>
+    <template v-else>
+        <div class="freePage crm" th:utext="${pageData.mobileContent}"></div>
+    </template>
 </div>
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/single-page/page.js(v=${version})}"></script>
+
 </body>
 </html>

+ 2 - 1
src/main/resources/templates/supplier-center/shop/goods.html

@@ -44,6 +44,7 @@
                                 <option value="2">已上架</option>
                                 <option value="3">已下架</option>
                                 <option value="9">已冻结</option>
+                                <option value="10">已隐身</option>
                                 <option value="0">已删除</option>
                             </select>
                         </div>
@@ -176,7 +177,7 @@
                                      <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"
+                                      v-if="['0','1','2','3','8','9','10'].indexOf(product.validFlag)!=-1"
                                            @click="editGoodFn(product)">编辑</a>
                                 </div>
                                 <div  class="good-price">

+ 0 - 1
src/main/resources/templates/supplier/index.html

@@ -204,7 +204,6 @@
             </div>
         </div>
     </div>
-
 </div>
 
 <!-- 引入底部 -->

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

@@ -107,7 +107,7 @@
                                                 <div class="info">
                                                     <p v-if="pros.productCategory != 2">规格:<span class="none">{{pros.productUnit ? pros.productUnit : ''}}</span> </p>
                                                     <p>数量:<span class="none">{{pros.num}}</span> </p>
-                                                    <p>单价:<span class="none">¥{{pros.price | NumFormat}}</span> </p>
+                                                    <p>单价:<span class="none">¥{{pros.price | NumFormat}}</span><span class="red" v-show="pros.includedTaxFlag ==' 1' || pros.includedTaxFlag == '2'">({{ pros.includedTaxFlag | formatIncludedTax }})</span></p>
                                                     <p>税率:<span class="none">{{pros.taxRate}}%</span></p>
                                                     <p>折扣:<span class="none">{{pros.discount == null ? '0' : pros.discount}}%</span></p>
                                                     <p>折后单价:<span class="none">¥{{pros.discountPrice | NumFormat}}</span></p>