From bb9baa4c41839962d7c15b48a2c1d2c1a94958a7 Mon Sep 17 00:00:00 2001 From: xu Date: Fri, 3 Apr 2020 21:22:28 +0800 Subject: [PATCH] app-wx v0.1.0 build 25 1. F 评论过滤危险录入 2. F 删除多余的js --- app-ht/modules/maintainer/controllers/UserController.php | 18 +++++++++--------- app-ht/modules/maintainer/views/user/info.php | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- app-wx/config/params.php | 2 +- app-wx/modules/order/controllers/CustomerController.php | 3 +++ app-wx/modules/order/views/default/pages/customer-order-template.php | 1 - web/admin/exts/showimg/css/showimg.css | 1 - web/admin/exts/showimg/js/jquery.imagezoom.min.js | 1 - web/admin/exts/showimg/js/jquery.rotate.min.js | 1 - web/admin/exts/showimg/js/showimg.js | 1 - web/src/vendor/mk7/cmpts/address-modal/address-modal.css | 121 ------------------------------------------------------------------------------------------------------------------------- web/src/vendor/mk7/cmpts/address-modal/address-modal.js | 1509 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- web/src/vendor/mk7/cmpts/agreement-checker/agreement-checker.css | 41 ----------------------------------------- web/src/vendor/mk7/cmpts/agreement-checker/agreement-checker.js | 104 -------------------------------------------------------------------------------------------------------- web/src/vendor/mk7/cmpts/jweixin/jweixin-1.4.0.js | 1 - web/src/vendor/mk7/js/app.js | 2 -- 15 files changed, 80 insertions(+), 1797 deletions(-) delete mode 100644 web/admin/exts/showimg/css/showimg.css delete mode 100644 web/admin/exts/showimg/js/jquery.imagezoom.min.js delete mode 100644 web/admin/exts/showimg/js/jquery.rotate.min.js delete mode 100644 web/admin/exts/showimg/js/showimg.js delete mode 100644 web/src/vendor/mk7/cmpts/address-modal/address-modal.css delete mode 100644 web/src/vendor/mk7/cmpts/address-modal/address-modal.js delete mode 100644 web/src/vendor/mk7/cmpts/agreement-checker/agreement-checker.css delete mode 100644 web/src/vendor/mk7/cmpts/agreement-checker/agreement-checker.js delete mode 100644 web/src/vendor/mk7/cmpts/jweixin/jweixin-1.4.0.js diff --git a/app-ht/modules/maintainer/controllers/UserController.php b/app-ht/modules/maintainer/controllers/UserController.php index 024eb57..c1acffb 100644 --- a/app-ht/modules/maintainer/controllers/UserController.php +++ b/app-ht/modules/maintainer/controllers/UserController.php @@ -122,17 +122,17 @@ class UserController extends BaseController 'status' => $userModel->status, 'address' => $userProfile->address, 'status_label' => User::getStatusLabels($userModel->status), - 'emergencyContact' => $userProfile->emergency_contact, - 'emergencyPerson' => $userProfile->emergency_person, - 'licensePic' => ImageManager::getUrl($userProfile->license_pic), - 'licensePicMin' => ImageManager::getUrl($userProfile->license_pic, 'min'), + 'emergencyContact' => $userProfile->emergency_contact, + 'emergencyPerson' => $userProfile->emergency_person, + 'licensePic' => ImageManager::getUrl($userProfile->license_pic), + 'licensePicMin' => ImageManager::getUrl($userProfile->license_pic, 'min'), 'factoryHeadPic' => ImageManager::getUrl($userProfile->factory_head_pic), 'factoryHeadPicMin' => ImageManager::getUrl($userProfile->factory_head_pic, 'min'), - 'techChargePic' => ImageManager::getUrl($userProfile->tech_charge_pic), - 'techChargePicMin' => ImageManager::getUrl($userProfile->tech_charge_pic, 'min'), - 'qaChargePic' => ImageManager::getUrl($userProfile->qa_charge_pic), - 'qaChargePicMin' => ImageManager::getUrl($userProfile->qa_charge_pic, 'min'), - 'created_at' => $userModel->created_at + 'techChargePic' => ImageManager::getUrl($userProfile->tech_charge_pic), + 'techChargePicMin' => ImageManager::getUrl($userProfile->tech_charge_pic, 'min'), + 'qaChargePic' => ImageManager::getUrl($userProfile->qa_charge_pic), + 'qaChargePicMin' => ImageManager::getUrl($userProfile->qa_charge_pic, 'min'), + 'created_at' => $userModel->created_at ]; $params['user'] = $user; diff --git a/app-ht/modules/maintainer/views/user/info.php b/app-ht/modules/maintainer/views/user/info.php index 5854a70..16f9ae2 100644 --- a/app-ht/modules/maintainer/views/user/info.php +++ b/app-ht/modules/maintainer/views/user/info.php @@ -61,23 +61,75 @@ $this->params['breadcrumbs'][] = $this->title; 营业执照 - + 门头照 - + 维修技术负责人证书 - + 质检负责人证书 - + + diff --git a/app-wx/config/params.php b/app-wx/config/params.php index 999cd1a..aa36adf 100644 --- a/app-wx/config/params.php +++ b/app-wx/config/params.php @@ -2,5 +2,5 @@ return [ 'adminEmail' => 'admin@example.com', 'testLoginPhones' => ['13900139001000'], - 'VERSION' => 'v0.1.0 build 24', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数 + 'VERSION' => 'v0.1.0 build 25', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数 ]; diff --git a/app-wx/modules/order/controllers/CustomerController.php b/app-wx/modules/order/controllers/CustomerController.php index a746cec..3aac6ea 100644 --- a/app-wx/modules/order/controllers/CustomerController.php +++ b/app-wx/modules/order/controllers/CustomerController.php @@ -3,6 +3,7 @@ namespace app\wx\modules\order\controllers; use Yii; +use yii\helpers\HtmlPurifier; use common\helpers\ImageManager; use common\helpers\Utils; use domain\order\RepairOrderRate; @@ -12,6 +13,7 @@ use domain\order\RepairOrderStatus; use stdClass; + /** * 控制器 */ @@ -123,6 +125,7 @@ class CustomerController extends CustomerBaseController $serviceStar = $this->request->post('serviceStar'); $orderUUId = $this->request->post('id'); $comment = $this->request->post('comment'); + $comment = HtmlPurifier::process($comment,['HTML.Allowed'=> '']); $images = $this->request->post('images'); $userId = $this->getUserId(); $orderModel = RepairOrderRepository::findOne(['short_uuid' => $orderUUId]); diff --git a/app-wx/modules/order/views/default/pages/customer-order-template.php b/app-wx/modules/order/views/default/pages/customer-order-template.php index c5ff6cd..ed75aa3 100644 --- a/app-wx/modules/order/views/default/pages/customer-order-template.php +++ b/app-wx/modules/order/views/default/pages/customer-order-template.php @@ -163,7 +163,6 @@ $baseUrl = Url::base(true); {{#js_compare "'finish' == this.item.status"}} - {{#js_compare "this.item.finishImages.length > 0"}}
维修完成照片
diff --git a/web/admin/exts/showimg/css/showimg.css b/web/admin/exts/showimg/css/showimg.css deleted file mode 100644 index ebfdccc..0000000 --- a/web/admin/exts/showimg/css/showimg.css +++ /dev/null @@ -1 +0,0 @@ -#img_alert{width:100%;height:100%;display:none;position:absolute;top:0;left:0;background-color:rgba(0,0,0,.42)}#img_alert .img_content{width:504px;height:auto;position:relative;left:50%;margin-left:-200px;opacity:0;top:50%;border:2px solid #fff}#img_alert .img_content .closed{width:25px;height:25px;background-color:#636363;display:inline-block;position:absolute;top:-13px;right:-10px;text-align:center;border-radius:100%;color:#fff;cursor:pointer}#img_alert .img_content img{width:500px;display:inherit;height:auto}.qrcode-number{display:block;height:280px;text-align:center;vertical-align:middle} \ No newline at end of file diff --git a/web/admin/exts/showimg/js/jquery.imagezoom.min.js b/web/admin/exts/showimg/js/jquery.imagezoom.min.js deleted file mode 100644 index 1a842a4..0000000 --- a/web/admin/exts/showimg/js/jquery.imagezoom.min.js +++ /dev/null @@ -1 +0,0 @@ -function MouseEvent(e){this.x=e.pageX,this.y=e.pageY}!function($){$.fn.imagezoom=function(options){function mouseOutImage(){$(self).attr("alt",noalt),$(document.body).unbind("mousemove"),$("div.zoomMask").remove(),$("div.zoomDiv").remove()}var settings={xzoom:310,yzoom:310,offset:10,position:"BTR",preload:1};options&&$.extend(settings,options);var noalt="",self=this;$(this).bind("mouseenter",function(ev){var imageLeft=$(this).offset().left,imageTop=$(this).offset().top,imageWidth=$(this).get(0).offsetWidth,imageHeight=$(this).get(0).offsetHeight,boxLeft=$(this).parent().offset().left,boxTop=$(this).parent().offset().top,boxWidth=$(this).parent().width(),imageRotate=($(this).parent().height(),$(this).get(0).style.transform?$(this).get(0).style.transform.substring($(this).get(0).style.transform.indexOf("(")+1,$(this).get(0).style.transform.indexOf("deg)")):0);""!=$(this).get(0).style.transform&&""!=imageRotate&&!isNaN(imageRotate)&&imageRotate>0&&imageRotate/90%2==1&&(imageWidth=$(this).get(0).offsetHeight,imageHeight=$(this).get(0).offsetWidth),noalt=$(this).attr("alt");var bigimage=$(this).attr("rel");$(this).attr("alt",""),0==$("div.zoomDiv").get().length&&$(document.body).append("
 
"),"BTR"==settings.position?boxLeft+boxWidth+settings.offset+settings.xzoom>screen.width?leftpos=boxLeft-settings.offset-settings.xzoom:leftpos=boxLeft+boxWidth+settings.offset:(leftpos=imageLeft-settings.xzoom-settings.offset,leftpos<0&&(leftpos=imageLeft+imageWidth+settings.offset)),$("div.zoomDiv").css({top:boxTop,left:leftpos}),$("div.zoomDiv").width(settings.xzoom),$("div.zoomDiv").height(settings.yzoom),$("div.zoomDiv").show(),$(this).css("cursor","crosshair"),$(document.body).mousemove(function(e){if(mouse=new MouseEvent(e),mouse.ximageLeft+imageWidth||mouse.yimageTop+imageHeight)return void mouseOutImage();var bigwidth=$(".bigimg").get(0).offsetWidth,bigheight=$(".bigimg").get(0).offsetHeight,scaley="x",scalex="y";if(isNaN(scalex)|isNaN(scaley)){var scalex=bigwidth/imageWidth,scaley=bigheight/imageHeight;""!=imageRotate&&!isNaN(imageRotate)&&imageRotate>0&&(90==imageRotate||270==imageRotate)&&(scalex=bigwidth/imageHeight,scaley=bigheight/imageWidth),$("div.zoomMask").width(settings.xzoom/scalex),$("div.zoomMask").height(settings.yzoom/scaley),$("div.zoomMask").css("visibility","visible")}xpos=mouse.x-$("div.zoomMask").width()/2,ypos=mouse.y-$("div.zoomMask").height()/2,xposs=mouse.x-$("div.zoomMask").width()/2-imageLeft,yposs=mouse.y-$("div.zoomMask").height()/2-imageTop,xpos=mouse.x-$("div.zoomMask").width()/2imageWidth+imageLeft?imageWidth+imageLeft-$("div.zoomMask").width():xpos,ypos=mouse.y-$("div.zoomMask").height()/2imageHeight+imageTop?imageHeight+imageTop-$("div.zoomMask").height():ypos,$("div.zoomMask").css({top:ypos,left:xpos}),$("div.zoomDiv").get(0).scrollLeft=xposs*scalex,$("div.zoomDiv").get(0).scrollTop=yposs*scaley,""!=imageRotate&&!isNaN(imageRotate)&&imageRotate>0&&($("div.zoomDiv").get(0).style.transform="rotate("+imageRotate+"deg)",console.log("imageLeft="+imageLeft+",imageTop="+imageTop+",imagewidth = "+imageWidth+",imageHeight="+imageHeight+",xposs="+xposs+",yposs="+yposs)),""!=imageRotate&&!isNaN(imageRotate)&&imageRotate>0&&90==imageRotate?(yposs=mouse.y-imageTop-$("div.zoomMask").height()/2,xposs=imageWidth+imageLeft-mouse.x-$("div.zoomMask").width()/2,$("div.zoomDiv").get(0).scrollTop=xposs*scalex,$("div.zoomDiv").get(0).scrollLeft=yposs*scaley):""!=imageRotate&&!isNaN(imageRotate)&&imageRotate>0&&180==imageRotate?(yposs=imageHeight-(mouse.y-imageTop)-$("div.zoomMask").height()/2,xposs=imageWidth+imageLeft-mouse.x-$("div.zoomMask").width()/2,$("div.zoomDiv").get(0).scrollLeft=xposs*scalex,$("div.zoomDiv").get(0).scrollTop=yposs*scaley):""!=imageRotate&&!isNaN(imageRotate)&&imageRotate>0&&270==imageRotate&&(yposs=mouse.x-imageLeft-$("div.zoomMask").width()/2,xposs=imageHeight+imageTop-mouse.y-$("div.zoomMask").height()/2,$("div.zoomDiv").get(0).scrollLeft=xposs*scalex,$("div.zoomDiv").get(0).scrollTop=yposs*scaley)})}),count=0,settings.preload&&($("body").append(""),$(this).each(function(){var imagetopreload=$(this).attr("rel"),content=jQuery("div.jqPreload"+count).html();jQuery("div.jqPreload"+count).html(content+'')}))}}(jQuery); \ No newline at end of file diff --git a/web/admin/exts/showimg/js/jquery.rotate.min.js b/web/admin/exts/showimg/js/jquery.rotate.min.js deleted file mode 100644 index 11ae4f9..0000000 --- a/web/admin/exts/showimg/js/jquery.rotate.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(k){for(var d,f,l=document.getElementsByTagName("head")[0].style,h=["transformProperty","WebkitTransform","OTransform","msTransform","MozTransform"],g=0;gthis._parameters.duration;if(b&&!this._parameters.animatedGif)clearTimeout(this._timer);else{(this._canvas||this._vimage||this._img)&&(a=this._parameters.easing(0,a-this._animateStartTime,this._animateStartAngle,this._parameters.animateTo-this._animateStartAngle,this._parameters.duration),this._rotate(~~(10*a)/10)),this._parameters.step&&this._parameters.step(this._angle);var c=this;this._timer=setTimeout(function(){c._animate.call(c)},10)}this._parameters.callback&&b&&(this._angle=this._parameters.animateTo,this._rotate(this._angle),this._parameters.callback.call(this._rootObj))},_rotate:function(){var a=Math.PI/180;return IE?function(a){this._angle=a,this._container.style.rotation=a%360+"deg",this._vimage.style.top=-(this._rotationCenterY-this._imgHeight/2)+"px",this._vimage.style.left=-(this._rotationCenterX-this._imgWidth/2)+"px",this._container.style.top=this._rotationCenterY-this._imgHeight/2+"px",this._container.style.left=this._rotationCenterX-this._imgWidth/2+"px",console.log(this._container)}:d?function(a){this._angle=a,this._img.style[d]="rotate("+a%360+"deg)",this._img.style[f]=this._parameters.center.join(" ")}:function(b){this._angle=b,b=b%360*a,this._canvas.width=this._width,this._canvas.height=this._height,this._cnv.translate(this._imgWidth*this._aspectW,this._imgHeight*this._aspectH),this._cnv.translate(this._rotationCenterX,this._rotationCenterY),this._cnv.rotate(b),this._cnv.translate(-this._rotationCenterX,-this._rotationCenterY),this._cnv.scale(this._aspectW,this._aspectH),this._cnv.drawImage(this._img,0,0),console.log(this._cnv)}}()},IE&&(Wilq32.PhotoEffect.prototype.createVMLNode=function(){document.createStyleSheet().addRule(".rvml","behavior:url(#default#VML)");try{return!document.namespaces.rvml&&document.namespaces.add("rvml","urn:schemas-microsoft-com:vml"),function(a){return document.createElement("')}}catch(a){return function(a){return document.createElement("<"+a+' xmlns="urn:schemas-microsoft.com:vml" class="rvml">')}}}())}(jQuery); \ No newline at end of file diff --git a/web/admin/exts/showimg/js/showimg.js b/web/admin/exts/showimg/js/showimg.js deleted file mode 100644 index d976d46..0000000 --- a/web/admin/exts/showimg/js/showimg.js +++ /dev/null @@ -1 +0,0 @@ -$(document).ready(function(){$("img[name='show_img']").click(function(){var imgsrc=$(this).attr("src");$("#img_alert .img_content img").attr("src",imgsrc),$("#img_alert").show();var height=$("#img_alert .img_content").height();$("#img_alert .img_content").css({"margin-top":-(height/2),opacity:"1"})}),$("#img_alert .img_content .closed").click(function(){$(this).parents(".img_content").css({opacity:"0"}),$("#img_alert").hide()})}); \ No newline at end of file diff --git a/web/src/vendor/mk7/cmpts/address-modal/address-modal.css b/web/src/vendor/mk7/cmpts/address-modal/address-modal.css deleted file mode 100644 index ba7fd90..0000000 --- a/web/src/vendor/mk7/cmpts/address-modal/address-modal.css +++ /dev/null @@ -1,121 +0,0 @@ -/**地址包CSS*/ -/*内容ROW*/ -#view-address-list .page-content, -#view-profile-address-add .page-content -{ - background: #fff; - padding-top: 40px; -} - -#view-address-list .footer-buttons { - position: absolute; - left: 0; - right: 0; - bottom: 0; - height: 50px; - line-height: 50px; - text-align: center; - font-size: 16px; - color: #fff; - background-color: #dd2727; - z-index: 5001; -} - -/**地址列表显示*/ -#view-address-list .list-block.media-list .item-address-row{ - display: -webkit-box; - display: -ms-flexbox; - display: -webkit-flex; - display: flex; - -webkit-box-pack: justify; - -ms-flex-pack: justify; - -webkit-justify-content: space-between; - justify-content: space-between; -} -#view-address-list .list-block{ - margin-top:0; - margin-bottom: 0; -} - -#view-address-list .address-info .item-content { - padding-top: 6px; -} - -#view-address-list .address-info .item-text { - height: auto; - padding-top: 6px; -} -#view-address-list .address-info .item-inner:after { - height: 0; -} -#view-address-list li.address-info:after { - content: ''; - position: absolute; - left: 0; - bottom: 0; - right: auto; - top: auto; - border-bottom: 1px dashed #eee; - width: 100%; - display: block; - z-index: 15; - -webkit-transform-origin: 50% 100%; - transform-origin: 50% 100%; - } - -#view-address-list .address-buttons{ - font-size: 14px; -} - -#view-address-list .address-buttons .item-inner{ - padding-top: 13px; -} - -#view-address-list .address-buttons .item-title{ - padding-top: 1px; -} - -#view-address-list .add-buttons { - padding: 20px 5px 20px 5px; -} - -#view-address-list .add-buttons .button { - line-height: 30px; -} - -#view-address-list .add-buttons .iconfont{ - position: absolute; - left: 23%; -} -#view-address-list .add-buttons .iconfont.icon-tianjia{ - top: 1%; -} -#view-address-list .add-buttons .iconfont.icon-weixin{ - top: -1%; -} - - -/**地址编辑显示*/ -#view-profile-address-add .placeholder { - color : #9e9e9e; -} - -/**省级样式*/ -/*省 市 区 默认选中值*/ -#view-area-list .selected { - color: #dd2727; - cursor: none; -} -#view-area-list .selected i { - color: #dd2727; -} -#view-area-list .page-content { - padding-top: 40px; -} -#view-area-list .list-block .item-content { - margin: 0; - padding: 0; -} -#view-area-list .list-block .item-content .item-title { - padding-left: 20px; -} diff --git a/web/src/vendor/mk7/cmpts/address-modal/address-modal.js b/web/src/vendor/mk7/cmpts/address-modal/address-modal.js deleted file mode 100644 index 22bf25c..0000000 --- a/web/src/vendor/mk7/cmpts/address-modal/address-modal.js +++ /dev/null @@ -1,1509 +0,0 @@ -/** - *Created by Administrator on 2016/6/27. - * 依赖组件， - * modals - */ -define( - 'mk7/address-modal', - [ - 'mk7/controller', - 'mk7/utils', - 'mk7/jweixin', - 'css!cmpts/address-modal/address-modal.css' - ], - function(ctrl, utils, jweixin) { - - var $$ = Dom7; - var t7 = Template7; - - //判断是否为空 返回TURE 为空 - var _isEmpty = function(value){ - if((!value) || (typeof(value) == "undefined") || (value == 0)) { - return true; - } else { - return false; - } - }; - - //打开弹出框 - var openPopup = function(html){ - AddressModal.app.popup(html); - }; - - //关掉弹出框 - var closePopup = function(e) { - $$('.page-content').scrollTop(0); - AddressModal.app.closeModal(e); - }; - - //load提示 - var showIndicator = function(){ - AddressModal.app.showIndicator(); - }; - - //load关闭 - var hideIndicator = function(){ - AddressModal.app.hideIndicator(); - }; - - //更改默认地址操作出错信息提示 - var errorInfo = function(i){ - AddressModal.app.alert(i, '提示信息'); - }; - - - var _csrf = function(data){ - var p = $$("[name='csrf-param']").attr('content'); - var t = $$("[name='csrf-token']").attr('content'); - data[p] = t; - - return data; - }; - - // - var handlerE = ''; - - //地址列表 - var AddressList = { - //打开地址薄 - open: function(handlerE){ - //类本身 - var me = this; - - //打开弹出框 - openPopup(LIST_HTML); - - //AJAX 获取数据 - $$.ajax({ - url : AddressModal.loadAddressListUrl, - data:{ - }, - method: 'get', - dataType: 'json', - beforeSend: function(){ - //显示LOADING.. - showIndicator(); - }, - success: function(d){ - - if (true == d.success) { - - //填充数据 - me.renderList(d.addresses); - - //设地址为默认值,绑定地址编辑动作,绑定地址删除动作 - var contentE = $$('#view-address-list #list-content'); - contentE.find('.address-row').each(function(){ - //当前对象 - var element = $$(this); - //设置默认值 - me.bindSetDefaultEvent(element);// me.bindSetDefaultEvent - //删除地址 - me.bindRemoveEvent(element);// me.bindRemoveEvent - //编辑 - me.bindEditEvent(element);// me.bindEditEvent - }); - - //关闭地址薄 进行动作 - me.bindConfirmEvent(handlerE);// me.bindConfirmEvent - - //绑定新增事件 - me.bindAddEvent();// me.bindAddEvent - - //绑定微信新增加事件 - WeiXinAddress.init(); - - //滚动到默认值 - me.scrollShowPosition(); - - } else { - //关闭地址数据出框 - closePopup('.popup-edit-show'); - } - - }, - error: function(){}, - complete: function(){ - hideIndicator(); - } - }); - }, - //滚动到指定的位置 - scrollShowPosition : function() { - //默认选中的数据 - var contentElement = $$('#view-address-list #list-content'); - var id = contentElement.data('last-id'); - - //定位的位置 - var offset = contentElement.find('div[data-id="'+id+'"]').offset(); - - if(!_isEmpty(offset)) { - $$('.page-content').scrollTop(offset.top); - } - }, - //绑定设置默认地址 - bindSetDefaultEvent: function(element){ - var me = this; - - //绑定点击内容 - element.find('.address-info').on('click', function(){ - me.setDefault(element); - }); - - //绑定点击打勾 - element.find('.label-checkbox').on('click', function(){ - //删除默认标记 - me.removeSelect(); - - me.setDefault(element); - }); - }, - //设置默认地址操作 - setDefault : function(element){ - var me = this; - - //记录默认元素 - var contentE = $$('#view-address-list #list-content'); - - //地址ID - var id = element.data('id'); - //收货人名称 - var newName = element.data('name'); - //收货人手机号码 - var newMobile = element.data('mobile'); - //收货人详细地址 - var newAddress = element.data('address'); - - //ajax 更改数据库 - $$.ajax({ - url: AddressModal.setDefaultAddressUrl, - data: _csrf({ - 'id': id - }), - method: 'POST', - dataType: 'json', - beforeSend: function(){ - - //显示LOADING.. - showIndicator(); - }, - success: function(d){ - if(true == d.success) { - //删除默认标记 - me.removeSelect(); - - //更改默认ID - contentE.data('last-id', id); - //记录默认收货人 - contentE.data('default-name', newName); - //记录默认收货人手机号码 - contentE.data('default-mobile', newMobile); - //记录默认收货人详细地址(省份+市级+区级+详细地址) - contentE.data('default-address', newAddress); - - //增加默认标记 - element.find('input[type="checkbox"]').prop('checked', true); - } else { - //重新打开地址薄 - AddressList.open(handlerE); - } - }, - error: function(){}, - complete: function(){ - //关闭LOADING - hideIndicator(); - } - }); - }, - //移除所有选中地址的状态 - removeSelect : function() { - //记录默认元素 - var contentE = $$('#view-address-list #list-content'); - contentE.find('input[type="checkbox"]').prop('checked', false); - }, - //写入地址默认值 - setAddressData : function(data) { - //记录地址默认值 - var contentE = $$('#view-address-list #list-content'); - - var id = ''; - var fullAddress = ''; - var consignee = ''; - var mobile = ''; - var province_id = ''; - var city_id = ''; - var district_id = ''; - if(!_isEmpty(data)) { - id = data.id; - consignee = data.consignee; - mobile = data.mobile; - fullAddress = data.province_label + data.city_label + data.district_label + data.address; - province_id = data.province_id; - city_id = data.city_id; - district_id = data.district_id; - } - - //记录默认地址ID - contentE.data('last-id', id); - - //记录默认收货人 - contentE.data('default-name', consignee); - - //记录默认收货人手机号码 - contentE.data('default-mobile', mobile); - - //记录默认收货人详细地址(省份+市级+区级+详细地址) - contentE.data('default-address', fullAddress); - - //记录选中省份ID - contentE.data('province-id', province_id); - - //记录选中市级ID - contentE.data('city-id', city_id); - - //记示选中区级ID - contentE.data('district-id', district_id); - }, - //删除地址 - bindRemoveEvent: function(e){ - var me = this; - - e.find(".row-delete").on('click', function(){ - //获取当前操作ID - var id = parseInt(e.data('id')); - - //默认设置元素 - var contentE = $$('#view-address-list #list-content'); - - //获取已设置的默认ID - var lastId = parseInt(contentE.data('last-id')); - - //只有一个地址,不能进行删除 - var addressLength = contentE.find('.address-row'); - if(1 >= addressLength.length){ - utils.toast({content : '只有一个地址,不能进行删除操作'}); - return; - } - - //地址删除信息提示 - AddressModal.app.confirm('确定删除选中的地址?', '提示信息', function(){ - - // ajax 操作删除数据库的数据 - $$.ajax({ - url: AddressModal.removeAddressUrl, - data: _csrf({ - id: id - }), - method: 'POST', - dataType: 'json', - beforeSend: function(){ - //显示LOADING.. - showIndicator(); - }, - success: function(d){ - if(true == d.success){ - - //默认地址设置 - if(id == lastId) { - - //写入默认地址值 - me.setAddressData(d.addressDefault); - - //改为默认图标 - var selectElement = contentE.find('div[data-id="'+d.addressDefault.id+'"]'); - selectElement.find('input[type="checkbox"]').prop('checked', true); - } - - //删除选中的数据 - e.remove(); - } else { - utils.toast({content : d.code}); - } - }, - error: function(){}, - complete: function(){ - //关闭LOADING.. - hideIndicator(); - } - }); - - }); - }); - }, - //编辑地址 - bindEditEvent: function(e){ - //绑定更改动作, - e.find(".row-change").each(function(){ - var childE = $$(this); - childE.on('click', function(){ - //地址编辑 - var id = e.attr('data-id'); - - //ajax获取服务器端数据 - $$.ajax({ - url: AddressModal.loadAddressUrl, - data:{ - id: id - }, - method: 'get', - dataType: 'json', - beforeSend: function(){ - //显示LOADING.. - showIndicator(); - }, - success: function(d){ - if(true == d.success) { - Address.open(d.data); - } - }, - error: function(){}, - complete: function(){ - //关闭LOADING - hideIndicator(); - } - - }); - }); - }); - }, - //新增地址 - bindAddEvent: function () { - $$('#view-address-list .address-edit').on('click', function(){ - //默认设置元素 - var contentE = $$('#view-address-list #list-content'); - - //只有一个地址,不能进行删除 - var addressLength = contentE.find('.address-row'); - if(addressLength.length > 20){ - utils.toast({content : '添加地址已达到上限,不能进行添加操作'}); - return; - } - - Address.open(); - }); - }, - //关闭地址 - bindConfirmEvent: function(){ - var me = this; - $$('#view-address-list #address_close_popup').on('click', function(){ - - //默认显示内容 - var contentE = $$('#view-address-list #list-content'); - - //获取默认收货人 - var defaultName = contentE.data('default-name'); - //获取默认收货人手机号码 - var defaultMobile = contentE.data('default-mobile'); - //获取默认收货人详细地址(省份+市级+区级+详细地址) - var defaultAddress = contentE.data('default-address'); - //获取选中省份ID - var provinceId = contentE.data('province-id'); - //获取选中市级ID - var cityId = contentE.data('city-id'); - //获取选中区级ID - var districtId = contentE.data('district-id'); - - AddressModal.trigger('confirm', { - provinceId : provinceId, - cityId : cityId, - districtId : districtId, - consignee : defaultName, - mobile : defaultMobile, - fullAddress : defaultAddress - }); - - closePopup('.popup-address-list'); - }); - }, - - //渲染地址内容 - renderList: function(datas){ - var me = this; - - //默认元素 - var e = $$('#view-address-list #list-content'); - - //数据 - var html = ''; - //没有数据显示 - if(0 == datas.length) { - //显示新增按钮 - //html += LIST_ADD_BUTTEN; - - } else { - //地址显示模板填充 - var compiledAddressDataTemplate = t7.compile(ADDRESS_DATA); - - for (var i=0; i 0) {//弹出事件 - scrollValue += buttonHeight; - $$('#view-profile-address-add .page-content').scrollTop(scrollValue); - } - - }); - } - - }; - - //编辑地址 - var Address = { - //打开编辑页面 - open: function(d){ - var me = this; - - //显示页面 - openPopup(ADD_HTML); - - //省份元素 - var provinceE = $$('#view-profile-address-add #area_province'); - //市级元素 - var cityE = $$('#view-profile-address-add #area_city'); - //区级元素 - var districtE = $$('#view-profile-address-add #area_district'); - //地址ID - var addressIdE = $$('#view-profile-address-add #address_id'); - //收货人 - var editConsigneeE = $$('#view-profile-address-add #edit_consignee'); - //手机号码 - var editMobileE = $$('#view-profile-address-add #edit_mobile'); - //详细地址 - var editAddressE = $$('#view-profile-address-add #edit_address'); - //请输入邮编 - var editZipCodeE = $$('#view-profile-address-add #edit_zip_code'); - //显示标题元素 - var editShowTitle = $$('#view-profile-address-add .edit_show_title'); - - //添加 - if(_isEmpty(d)) { - //添加 - editShowTitle.html('新增地址'); - } else {//编辑 - editShowTitle.html('编辑地址'); - - //编辑地址的ID存在 - if(_isEmpty(d.id)) { - errorInfo('操作有误,请重新操作!'); - closePopup('.popup-edit-show'); - return; - } - addressIdE.val(d.id); - - //收货人 edit_consignee - if(!_isEmpty(d.consignee)) { - editConsigneeE.val(d.consignee); - } - - //手机号码 edit_mobile - if(!_isEmpty(d.mobile)) { - editMobileE.val(d.mobile); - } - - //所在省 area_province - if(!_isEmpty(d.province_id)) { - provinceE.attr('data-id', d.province_id); - - //显示市级选框 - var addCityE = $$('#view-profile-address-add #li_city'); - if(addCityE.hasClass('area-hide')) { - addCityE.removeClass('area-hide').addClass('area-list'); - } - cityE.html(CITY_PLACEHOLDER); - cityE.attr('data-id', ''); - - //所在省名称 values - if(!_isEmpty(d.province_label)) { - provinceE.html(d.province_label); - } - } - - //所在市 area_city data-id - if(!_isEmpty(d.city_id)) { - cityE.attr('data-id', d.city_id); - //显示区级 - var addDistrictE = $$('#view-profile-address-add #li-district'); - if(!addDistrictE.hasClass('area-list')) { - addDistrictE.removeClass('area-hide').addClass('area-list'); - } - districtE.html(DISTRICT_PLACEHOLDER); - districtE.attr('data-id', ''); - - //所在市名称 values - if(!_isEmpty(d.city_label)) { - cityE.html(d.city_label); - } - } - - //所在区 area_district - if(!_isEmpty(d.district_id)) { - districtE.attr('data-id', d.district_id); - - //所在区名称 values - if(!_isEmpty(d.district_label)) { - districtE.html(d.district_label); - } - } - - //详细地址 edit_address - if(!_isEmpty(d.address)) { - editAddressE.val(d.address); - } - //请输入邮编 edit_zip_code - if(!_isEmpty(d.zip_code)) { - editZipCodeE.val(d.zip_code); - } - } - // 输入法挡住输入框解决方案 - // if (AddressModal.app.device.os === 'android') { - // - // // $$('#view-profile-address-add #edit_address').on('focus', function () { - // - // $$('#view-profile-address-add #edit_address').on('focus', function () { - // - // var element = this; - // inputScroll(element, 'edit_address'); - // }); - // $$('#view-profile-address-add #edit_address').on('blur', function () { - // $$('.page-content').scrollTop(0); - // }); - // $$('#view-profile-address-add #edit_zip_code').on('focus', function () { - // var element = this; - // inputScroll(element, 'edit_zip_code'); - // }); - // $$('#view-profile-address-add #edit_zip_code').on('blur', function () { - // $$('.page-content').scrollTop(0); - // }); - // } - - //关掉弹出编辑页面 - me.close(); - - //省级设置 - provinceE.on('click', function(){ - me.regionAjax(1, 'area_province'); - }); - - //市级设置 - cityE.on('click', function(){ - var provinceId = provinceE.attr('data-id'); - me.regionAjax(provinceId, 'area_city'); - }); - - //区级设置 - districtE.on('click', function(){ - var cityId = cityE.attr('data-id'); - me.regionAjax(cityId, 'area_district'); - }); - - //保存地址 - me.save(); - - }, - //保存地址 - save: function(){ - var me = this; - $$('#view-profile-address-add .col-button').on('click', function(){ - //省份元素 - var provinceE = $$('#view-profile-address-add #area_province'); - //市级元素 - var cityE = $$('#view-profile-address-add #area_city'); - //区级元素 - var districtE = $$('#view-profile-address-add #area_district'); - //地址ID - var addressIdE = $$('#view-profile-address-add #address_id'); - //收货人 - var editConsigneeE = $$('#view-profile-address-add #edit_consignee'); - //手机号码 - var editMobileE = $$('#view-profile-address-add #edit_mobile'); - //详细地址 - var editAddressE = $$('#view-profile-address-add #edit_address'); - //请输入邮编 - var editZipCodeE = $$('#view-profile-address-add #edit_zip_code'); - - //地址ID - var id = addressIdE.val(); - - //收货人 - var consignee = editConsigneeE.val(); - - //手机号码 - var mobile = editMobileE.val(); - - //所在省 - var province_id = provinceE.attr('data-id'); - - //所在市 - var city_id = cityE.attr('data-id'); - - //所在区 - var district_id = districtE.attr('data-id'); - - //详细地址 - var edit_address = editAddressE.val(); - - //输入邮编 - var zip_code = editZipCodeE.val(); - - //检测 - if(_isEmpty(consignee)) { - editConsigneeE.focus(); - errorInfo('收货人不能为空!'); - return; - } - if(_isEmpty(mobile)) { - editMobileE.focus(); - errorInfo('手机号码不能为空!'); - return; - } - if(_isEmpty(province_id)) { - errorInfo('请选择省份!'); - return; - } - if(_isEmpty(city_id)) { - errorInfo('请选择市级!'); - return; - } - if(_isEmpty(district_id)) { - errorInfo('请选择区级!'); - return; - } - if(_isEmpty(edit_address)) { - editAddressE.focus(); - errorInfo('请选择详细地址!'); - return; - } - if(!_isEmpty(zip_code) && !utils.isZipcode(zip_code)) { - editZipCodeE.focus(); - errorInfo('请输入正确的邮编格式!'); - return; - } - //地址数据AJAX更新 - me.ajaxSave({ - id: id, - mobile: mobile, - consignee: consignee, - province_id: province_id, - city_id: city_id, - district_id: district_id, - address: edit_address, - zip_code: zip_code - }); - }); - }, - - ajaxSave : function(data){ - - $$.ajax({ - url: AddressModal.saveAddressUrl, - data:_csrf(data), - method: 'POST', - dataType: 'json', - beforeSend: function(){ - //显示LOADING.. - showIndicator(); - }, - success: function(d){ - if(true == d.success) { - //关闭LOADING - hideIndicator(); - - //关闭地址编辑显示 - closePopup('.popup-edit-show'); - //关闭地址薄 - closePopup('.popup-address-list'); - //重新打开地址薄 - AddressList.open(handlerE); - } else { - //关闭LOADING - hideIndicator(); - - utils.toast({content : d.code}); - - //重新打开地址薄 - AddressList.open(handlerE); - } - }, - error: function(){}, - complete: function(){ - } - }); - }, - - //地区处理 - regionAjax: function(id, key){ - var me = this; - - //省份元素 - var provinceE = $$('#view-profile-address-add #area_province'); - //市级元素 - var cityE = $$('#view-profile-address-add #area_city'); - //区级元素 - var districtE = $$('#view-profile-address-add #area_district'); - - var defaultElement = $$('#view-profile-address-add #'+key); - var selectedDefaultId = parseInt(defaultElement.data('id')); - - var options = []; - if('area_province' == key) { - options.title = '选择所在省份'; - } else if('area_city' == key) { - options.title = '选择所在市级'; - } else if('area_district' == key) { - options.title = '选择所在区级'; - } - options.selectedDefaultId = selectedDefaultId; - AreaList.init(options); - - //AJAX处理 - $$.ajax({ - url: AddressModal.loadRegionListUrl, - data:{ - id : id - }, - method: 'get', - dataType: 'json', - beforeSend: function(){ - //显示LOADING.. - showIndicator(); - }, - success: function(d){ - - if(true == d.success) { - //填充数据 - AreaList.render(d.items); - AreaList.on('select', function(params){ - defaultElement.attr('data-id', params.selectedId); - defaultElement.attr('data-zip', params.selectedZipcode); - $$('#edit_zip_code').val(params.selectedZipcode) - defaultElement.html(params.selectedLabel); - - me.controlAreaOption(key); - }); - } else { - closePopup('.popup-area'); - } - }, - error: function(){}, - complete: function(){ - //关闭LOADING - hideIndicator(); - } - - }); - }, - controlAreaOption : function(key) { - //省份 控制市级显示 隐藏区级 - //市级元素操作 - var addCityE = $$('#view-profile-address-add #li_city'); - var cityE = $$('#view-profile-address-add #area_city'); - //区级元素操作 - var addDistrictE = $$('#view-profile-address-add #li-district'); - var districtE = $$('#view-profile-address-add #area_district'); - if('area_province' == key) { - //显示市级 - if(addCityE.hasClass('area-hide')) { - addCityE.removeClass('area-hide').addClass('area-show'); - } - cityE.html(CITY_PLACEHOLDER); - cityE.attr('data-id', ''); - - //隐藏区级 - addDistrictE.removeClass('area-show').addClass('area-hide'); - - districtE.html(DISTRICT_PLACEHOLDER); - districtE.attr('data-id', ''); - } else if('area_city' == key) { - //显示区级 - if(!addDistrictE.hasClass('area-show')) { - addDistrictE.removeClass('area-hide').addClass('area-show'); - } - districtE.html(DISTRICT_PLACEHOLDER); - districtE.attr('data-id', ''); - } else if('area_district' == key) { - - } - }, - //关掉编辑框 - close: function(){ - $$('#view-profile-address-add .profile-back').on('click', function(){ - closePopup('.popup-edit-show'); - }); - } - }; - - //地区处理 - var AreaList = {//area - title : '',// - selectedDefaultId : '',//选中的ID - events : new Object(), - on : function(name, callback){ - this.events[name] = callback; - }, - trigger : function(name, params){ - var me = this; - var callback = me.events[name]; - callback(params); - }, - //打开弹出框 - init : function(options){ - this.title = options.title; - this.selectedDefaultId = options.selectedDefaultId; - - this.open(); - this.close(); - }, - open: function(){ - var me = this; - //打开模板 - openPopup(AREA_HTML); - //更改标题 - $$('#view-area-list #area_title').html(me.title); - }, - //数据填充 - render: function(rows){ - var me = this; - - //模板填充 - var compiledTemplate = t7.compile(AREA_TPL); - - var scrollId = 0; - - var areaListElement = $$('#view-area-list #area-list ul'); - areaListElement.html(''); - for(var i = 0; i < rows.length; i++) { - //默认选中 - var selectedClass = ''; - var selectedIcon = ''; - if(me.selectedDefaultId == rows[i].id) { - scrollId = rows[i].id; - - selectedClass = 'selected'; - selectedIcon = SELECTED_ICON; - } - - //模板填充数据 SELECTED_ICON - var h = compiledTemplate({ - id: rows[i].id, - label: rows[i].label, - type: rows[i].type, - zip_code: rows[i].zip_code, - selectedClass: selectedClass, - selectedIcon: selectedIcon - }); - - areaListElement.append(h); - } - - this.bindEvents(); - - me.scrollShowPosition(scrollId); - }, - //滚动到指定的位置 - scrollShowPosition : function(id) { - var areaListElement = $$('#view-area-list #area-list'); - var offset = areaListElement.find('div[data-id="'+id+'"]').offset(); - - if(!_isEmpty(offset)) { - $$('.page-content').scrollTop(offset.top); - } - }, - //绑定选中动作 - bindEvents: function() { - var me = this; - - $$('#view-area-list #area-list').find('.item-inner').each(function(){ - //当前操作元素 - var element = $$(this); - - //点击范围 - element.on('click', function(){ - me.select(element); - }); - }); - }, - //选中操作 - select: function(element){ - var me = this; - - //省份元素 - var provinceE = $$('#view-profile-address-add #area_province'); - //市级元素 - var cityE = $$('#view-profile-address-add #area_city'); - //区级元素 - var districtE = $$('#view-profile-address-add #area_district'); - - //操作的元素 - var _element = element.find('.item-title'); - - //选中区级ID - var selectedId = _element.data('id'); - //选中区级名字 - var selectedLabel = _element.data('title'); - - var selectedType = _element.data('type'); - - if(me.removeSelected()){ - element.addClass('selected').find('.item-after').html(SELECTED_ICON); - } - - me.trigger('select', { - selectedId : selectedId, - selectedLabel : selectedLabel, - selectedZipcode:_element.data('zip'), - }); - - //关闭区级选择框 - setTimeout(function(){ - closePopup('.popup-area'); - - if (selectedType == 1) { - var provinceId = provinceE.attr('data-id'); - Address.regionAjax(provinceId, 'area_city'); - } else if (selectedType == 2) { - var cityId = cityE.attr('data-id'); - Address.regionAjax(cityId, 'area_district'); - } else if (selectedType == 3) { - /* var zip = districtE.attr('data-zip'); - console.log(zip) - $$('#edit_zip_code').val(zip)*/ - } - },300); - }, - removeSelected : function(){//去除选中状态 - var liElement = $$('#view-area-list #area-list .item-inner'); - liElement.removeClass('selected').find('.item-after').html(''); - return true; - }, - //关闭 - close: function(){ - $$('#view-area-list .close_area').on('click', function(){ - closePopup('.popup-area'); - }); - } - }; - - var AddressModal = { - app : null, - //地址 - baseUrl: '', - /** - * 初始化参数 - * **/ - //对外接口参数 - handler: '.show-address-modal', - //AJAX 读取地址接口 - loadAddressListRoute: 'address/ajax-list', - loadAddressListUrl : '', - //AJAX 删除地址的接口 - removeAddressRoute: 'address/ajax-remove', - removeAddressUrl : '', - //AJAX 设置默认地址的接口 - setDefaultAddressRoute: 'address/ajax-set-default', - setDefaultAddressUrl : '', - //AJAX 获取编辑地址资料接口 - loadAddressRoute: 'address/ajax-mgets', - loadAddressUrl : '', - //AJAX 保存地址资料接口 - saveAddressRoute: 'address/ajax-save', - saveAddressUrl : '', - //AJAX 地区的数据 json二维数据 AjaxRegion - loadRegionListRoute: 'address/ajax-region', - loadRegionListUrl: '', - //AJAX 获取微信参数设置 - loadWeiXinAddressParamsRoute: 'address/ajax-wei-xin-address-params', - loadWeiXinAddressParamsUrl: '', - //AJAX 验证微信地址是否在数据表中 - loadCheckExistRoute: 'address/ajax-check-exist', - loadCheckExistUrl : '', - events : new Object(), - on : function(name, callback){ - this.events[name] = callback; - }, - trigger : function(name, attrs){ - var callback = this.events[name]; - callback(attrs); - }, - init: function(options){ - - this.app = options.app; - - //初始化值 - if(!_isEmpty(options.baseUrl)) { - this.baseUrl = options.baseUrl + '/'; - } - //AJAX 读取地址接口 - if(!_isEmpty(options.loadAddressListRoute)) { - this.loadAddressListRoute = options.loadAddressListRoute; - } - this.loadAddressListUrl= this.baseUrl + this.loadAddressListRoute; - //AJAX 删除地址的接口 - if(!_isEmpty(options.removeAddressRoute)) { - this.removeAddressRoute = options.removeAddressRoute; - } - this.removeAddressUrl= this.baseUrl + this.removeAddressRoute; - //AJAX 设置默认地址的接口 - if(!_isEmpty(options.setDefaultAddressRoute)) { - this.setDefaultAddressRoute = options.setDefaultAddressRoute; - } - this.setDefaultAddressUrl= this.baseUrl + this.setDefaultAddressRoute; - //AJAX 获取编辑地址资料接口 - if(!_isEmpty(options.loadAddressRoute)) { - this.loadAddressRoute = options.loadAddressRoute; - } - this.loadAddressUrl= this.baseUrl + this.loadAddressRoute; - //AJAX 保存地址资料接口 - if(!_isEmpty(options.saveAddressRoute)) { - this.saveAddressRoute = options.saveAddressRoute; - } - this.saveAddressUrl= this.baseUrl + this.saveAddressRoute; - //AJAX 地址的数据 json二维数据 - if(!_isEmpty(options.loadRegionListRoute)) { - this.loadRegionListRoute = options.loadRegionListRoute; - } - this.loadRegionListUrl = this.baseUrl + this.loadRegionListRoute; - //AJAX 获取微信地址接口 - if(!_isEmpty(options.loadWeiXinAddressParamsRoute)){ - this.loadWeiXinAddressParamsRoute = options.loadWeiXinAddressParamsRoute; - } - this.loadWeiXinAddressParamsUrl = this.baseUrl + this.loadWeiXinAddressParamsRoute; - //AJAX 验证微信地址是否在数据表中 - if(!_isEmpty(options.loadCheckExistRoute)) { - this.loadCheckExistRoute = options.loadCheckExistRoute; - } - this.loadCheckExistUrl = this.baseUrl + this.loadCheckExistRoute; - - $$(this.handler).on('click', function(){ - handlerE = $$(this); - AddressList.open(handlerE); - }); - } - }; - - //模板 - //地址显示 - var LIST_HTML = - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
地址管理
' + - '
' + - ''+ - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
'+ - '
' + - - '
' + - ''+ - ' 手动添加'+ - '' + - '
'+ - '
' + - ''+ - ' 微信添加'+ - '' + - '
'+ - '
' + - '
' + - '' + - '
' + - '
' + - '
' + - '
' + - '
'; - //地址详细数据 - var ADDRESS_DATA = - '
' + - '
    '+ - '
  • '+ - '
    '+ - '
    '+ - '
    '+ - '
    {{username}}
    '+ - '
    {{mobile}}
    '+ - '
    '+ - '
    {{address}}
    '+ - '
    '+ - '
    '+ - '
    • '+ - '
  • '+ - '
    '+ - ''+ - '
    '+ - '
    '+ - '
    '+ - ' 设为默认地址'+ - '
    '+ - '
    '+ - '
    更改
       '+ - '
    删除
    '+ - '
    '+ - '
    '+ - '
    '+ - '
    '+ - - '
    • '+ - '
'+ - '
'; - - //显示地址新增，编辑页面 - var ADD_HTML = - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '' + - '返回' + - '' + - '
' + - '
'+ - '新增地址'+ - '
' + - '
'+ - '
'+ - '
' + - '
' + - '
' + - '
' + - '
    '+ - '
  • '+ - '
    '+ - '
    '+ - '
    '+ - '收货人：'+ - '
    '+ - '
    '+ - '' + - '
    ' + - '
    '+ - '
    '+ - '
    • '+ - '
  • '+ - '
    '+ - '
    '+ - '
    '+ - '手机号码：'+ - '
    '+ - '
    '+ - '' + - '
    ' + - '
    '+ - '
    '+ - '
    • '+ - '
  • '+ - '
    '+ - '
    '+ - '
    '+ - '所在省：'+ - '
    '+ - '
    '+ - '请选择所在省' + - '
    ' + - '
    '+ - '
    '+ - '
    • '+ - '
  • '+ - '
    '+ - '
    '+ - '
    '+ - '所在市：'+ - '
    '+ - '
    '+ - '请选择所在市' + - '
    ' + - '
    '+ - '
    '+ - '
    • '+ - '
  • '+ - '
    '+ - '
    '+ - '
    '+ - '所在区：'+ - '
    '+ - '
    '+ - '请选择所在区' + - '
    ' + - '
    '+ - '
    '+ - '
    • '+ - '
  • '+ - '
    '+ - '
    '+ - '
    '+ - '详细地址：'+ - '
    '+ - '
    '+ - '' + - '
    ' + - '
    '+ - '
    '+ - '
    • '+ - '
  • '+ - '
    '+ - '
    '+ - '
    '+ - '邮编：'+ - '
    '+ - '
    '+ - '' + - '
    ' + - '
    '+ - '
    '+ - '
    • '+ - '
'+ - '
'+ - '
' + - '
'+ - '
'+ - '保存'+ - ''+ - '
'+ - '
'+ - '
'+ - - '
' + - '
'+ - '
'+ - '
' + - '
'+ - '
'; - //显示地区列表 - var AREA_HTML = - '
' + - '
'+ - '
'+ - '
'+ - '
'+ - ''+ - '返回'+ - ''+ - '
'+ - '
'+ - '
'+ - '
'+ - '
'+ - '
'+ - '
'+ - '
' + - '
'+ - '
'+ - '
    '+ - - '
'+ - '
'+ - '
'+ - '
'+ - '
'+ - - '
'; - //显示地区模板 - var AREA_TPL = - '
  • ' + - '
    ' + - '
    ' + - '
    {{label}}
    ' + - '
    {{selectedIcon}}
    ' + - '
    ' + - '
    ' + - '
  • '; - - //成功打勾标志 - var SELECTED_ICON = - ''; - - //省份提示 - var PROVINCE_PLACEHOLDER = '请选择所在省'; - - //市级提示 - var CITY_PLACEHOLDER = '请选择所在市'; - - //区级提示 - var DISTRICT_PLACEHOLDER = '请选择所在区'; - - return AddressModal; - } -); - - diff --git a/web/src/vendor/mk7/cmpts/agreement-checker/agreement-checker.css b/web/src/vendor/mk7/cmpts/agreement-checker/agreement-checker.css deleted file mode 100644 index 037f03a..0000000 --- a/web/src/vendor/mk7/cmpts/agreement-checker/agreement-checker.css +++ /dev/null @@ -1,41 +0,0 @@ -/*********** cover start *****************/ - -#jw-overplay{visibility: visible; - opacity: 1; - z-index: 10499;position: absolute; - left: 0; - top: 0; - width: 100%; - height: 100%; transition-duration: .4s; -} -#jw-model-in{ - transform: translate3d(0,0,0); - transition-duration: .4s; - position: absolute; - left: 0; - top: 0; - width: 100%; - height: 100%; - z-index: 11000; - background: #fff; - box-sizing: border-box; - overflow: auto; - transition-property: transform; -} - -#agree-box-div { - width: 100%; - position: absolute; - background: #078BFF; - color: #fff; - z-index: 11111; - display: block; - bottom: 0; - left: 0; - padding: 4px; - box-sizing: border-box; -} - -#jw-close-cls{padding:8px;box-sizing: border-box;display: block;text-align: center;color: #fff;} - -/*********** cover end *****************/ \ No newline at end of file diff --git a/web/src/vendor/mk7/cmpts/agreement-checker/agreement-checker.js b/web/src/vendor/mk7/cmpts/agreement-checker/agreement-checker.js deleted file mode 100644 index 2fe25aa..0000000 --- a/web/src/vendor/mk7/cmpts/agreement-checker/agreement-checker.js +++ /dev/null @@ -1,104 +0,0 @@ -/* - - * - */ -define( - [ 'mk7/url', - 'css!cmpts/agreement-checker/agreement-checker.css' - - ], - function(url){ - $$ = Dom7; - var checkerCtrl = { - - } - - checkerCtrl.initServiceVersion = function () { - var me = this; - $$.ajax({ - method : "GET", - url: url.to('/user/default/get-service-version'), - dataType : "json", - beforeSend : function(){ - - }, - success : function(res){ - if(res.success){ - me.checkServiceAgreementVersion(res); - } - }, - error : function(e){}, - complete : function(e){} - }); - } - checkerCtrl.checkServiceAgreementVersion = function (setting) { - var me = this; - if (false == setting.showAgreement) { - return false; - } - $$("#index").hide(); - $$("#index-tabbar").hide(); - - me.readAgreementEvent(); - - $$.ajax({ - method: "GET", - url: url.to('/support/legal'), - data: {}, - dataType: "html", - beforeSend: function () { - //me.showIndicator(); - }, - success: function (res) { - - var popup_overlay = $$('
    '); - var jw_model_in = $$('
    '); - var agreebox = $$('') - jw_model_in.append(res); - $$('body').append(popup_overlay); - $$('body').append(jw_model_in); - $$('body').append(agreebox) - //me.app.popup(res); - }, - error: function (res) { - - }, - complete: function (res) { - - //me.hideIndicator(); - } - }); - }; - checkerCtrl.readAgreementEvent = function(){ - var me = this; - // read and close - $$('body').on('click', '#jw-close-cls', function (e) { - $$('#jw-overplay').remove(); - $$('#jw-model-in').remove(); - $$('#agree-box-div').remove(); - $$("#index").show(); - $$("#index-tabbar").show(); - $$.ajax({ - method: "GET", - url: url.to('/user/default/read-service-agreement'), - data: {}, - dataType: "json", - beforeSend: function () { - //me.showIndicator(); - }, - success: function (res) { - - }, - error: function (res) { - - }, - complete: function (res) { - //me.hideIndicator(); - } - }); - }); - }; - - return checkerCtrl; - - }) diff --git a/web/src/vendor/mk7/cmpts/jweixin/jweixin-1.4.0.js b/web/src/vendor/mk7/cmpts/jweixin/jweixin-1.4.0.js deleted file mode 100644 index a1f1c4b..0000000 --- a/web/src/vendor/mk7/cmpts/jweixin/jweixin-1.4.0.js +++ /dev/null @@ -1 +0,0 @@ -!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(this,function(e,n){function i(n,i,t){e.WeixinJSBridge?WeixinJSBridge.invoke(n,o(i),function(e){c(n,e,t)}):u(n,t)}function t(n,i,t){e.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),c(n,e,i)}):t?u(n,t):u(n,i)}function o(e){return e=e||{},e.appId=C.appId,e.verifyAppId=C.appId,e.verifySignType="sha1",e.verifyTimestamp=C.timestamp+"",e.verifyNonceStr=C.nonceStr,e.verifySignature=C.signature,e}function r(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function a(e){return e.postalCode=e.addressPostalCode,delete e.addressPostalCode,e.provinceName=e.proviceFirstStageName,delete e.proviceFirstStageName,e.cityName=e.addressCitySecondStageName,delete e.addressCitySecondStageName,e.countryName=e.addressCountiesThirdStageName,delete e.addressCountiesThirdStageName,e.detailInfo=e.addressDetailInfo,delete e.addressDetailInfo,e}function c(e,n,i){"openEnterpriseChat"==e&&(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=s(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",C.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function s(e,n){var i=e,t=v[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}function d(e){if(e){for(var n=0,i=e.length;n0){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}if(!e.jWeixin){var h={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},v=function(){var e={};for(var n in h)e[h[n]]=n;return e}(),S=e.document,I=S.title,y=navigator.userAgent.toLowerCase(),_=navigator.platform.toLowerCase(),k=!(!_.match("mac")&&!_.match("win")),w=-1!=y.indexOf("wxdebugger"),T=-1!=y.indexOf("micromessenger"),M=-1!=y.indexOf("android"),P=-1!=y.indexOf("iphone")||-1!=y.indexOf("ipad"),x=function(){var e=y.match(/micromessenger\/(\d+\.\d+\.\d+)/)||y.match(/micromessenger\/(\d+\.\d+)/);return e?e[1]:""}(),A={initStartTime:p(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},V={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:P?1:M?2:-1,clientVersion:x,url:encodeURIComponent(location.href)},C={},L={_completes:[]},B={state:0,data:{}};f(function(){A.initEndTime=p()});var O=!1,E=[],N={config:function(e){C=e,u("config",e);var n=!1!==C.check;f(function(){if(n)i(h.config,{verifyJsApiList:d(C.jsApiList)},function(){L._complete=function(e){A.preVerifyEndTime=p(),B.state=1,B.data=e},L.success=function(e){V.isPreVerifyOk=0},L.fail=function(e){L._fail?L._fail(e):B.state=-1};var e=L._completes;return e.push(function(){l()}),L.complete=function(n){for(var i=0,t=e.length;i0){var n=E.shift();wx.getLocalImgData(n)}},e))):E.push(e)},getNetworkType:function(e){var n=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e};i("getNetworkType",{},(e._complete=function(e){e=n(e)},e))},openLocation:function(e){i("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){e=e||{},i(h.getLocation,{type:e.type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){i("hideOptionMenu",{},e)},showOptionMenu:function(e){i("showOptionMenu",{},e)},closeWindow:function(e){i("closeWindow",{},e=e||{})},hideMenuItems:function(e){i("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){i("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){i("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){i("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){i("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(P){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){i(h.openAddress,{},(e._complete=function(e){e=a(e)},e))},openProductSpecificView:function(e){i(h.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,t=[],o=0,r=n.length;o