Authored by mali

Merge branch 'hot_fix/fix_coupon_select_time' into test6.8.5

Showing 24 changed files with 15 additions and 15 deletions
... ... @@ -5,10 +5,10 @@
<title>ufo后台管理</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
<link href="css/vendors.e025e652173e64d52029.css" rel="stylesheet"><link href="css/coupon.e025e652173e64d52029.css" rel="stylesheet"></head>
<link href="css/vendors.a4e4065cb3a310f8e68a.css" rel="stylesheet"><link href="css/coupon.a4e4065cb3a310f8e68a.css" rel="stylesheet"></head>
<body>
<div id="app"></div>
<script type="text/javascript" src="js/vendors.e025e652173e64d52029.js"></script><script type="text/javascript" src="js/coupon.e025e652173e64d52029.js"></script></body>
<script type="text/javascript" src="js/vendors.a4e4065cb3a310f8e68a.js"></script><script type="text/javascript" src="js/coupon.a4e4065cb3a310f8e68a.js"></script></body>
</html>
\ No newline at end of file
... ...
webpackJsonp([6],{134:function(t,e,a){"use strict";var o=a(9),s=a.n(o),i=a(24),n=a.n(i),l=a(4),r=a(8),d=a(41),c=a(104),m=a(132);e.a={name:"resourceEditNew",components:{Divide:m.a,bannerEditor:d.a,SmartFloor:c.a},data:function(){return{title:"",list:[],floorList:[],modalInfo:{modalType:0,modalTitle:"",resContentId:0,floorIndex:-1,template_intro:"",template_name:""},singleData:{data:{0:{alt:"",bgColor:"",imgId:"0",src:"",url:{action:"go.h5",url:""}}},type:3,template_intro:"一张图",template_name:"singleImage",resContentId:0},twoData:{data:{0:{alt:"",bgColor:"",imgId:"0",src:"",url:{action:"go.h5",url:""}},1:{alt:"",bgColor:"",imgId:"0",src:"",url:{action:"go.h5",url:""}}},type:4,template_intro:"两张图",template_name:"twoPicture",resContentId:0},resId:null,bg:"",show:!1,modalData:[],uploadData:{id:l.a.getQueryString("id"),items:[]}}},mounted:function(){this.resId=l.a.getQueryString("id"),this.title=l.a.getQueryString("name"),this.resourceService=new r.a,this.getResourceDetailList()},methods:{getResourceDetailList:function(){var t=this;this.resourceService.info(this.resId).then(function(e){console.log(e),t.list=e,t.manageAllData(e),t.manageFloorList(e)})},manageAllData:function(t){this.uploadData.items=[];for(var e=0;e<t.length;e++){var a={id:t[e].resContentId,contentName:t[e].name,templateKey:"123",contentData:t[e].data,type:t[e].type};this.uploadData.items.push(a)}},manageFloorList:function(t){this.floorList=[];for(var e=0;e<t.length;e++){var a=JSON.parse(t[e].data);a.resContentId=t[e].resContentId,a.type=t[e].type,this.floorList.push(a),console.log("floorList:",this.floorList)}},showModal:function(t,e,a){console.log(e,a);var o=0,s="";for(var i in e.data){var n=e.data[i];this.modalData.push(n)}switch(console.log("modalData:",this.modalData),t){case"singleImage":o=3,s="一张图";break;case"twoPicture":o=4,s="两张图"}o&&(this.modalInfo.modalType=o,this.modalInfo.modalTitle=s,this.modalInfo.resContentId=e.resContentId,this.modalInfo.template_intro=e.template_intro,this.modalInfo.template_name=e.template_name,this.modalInfo.floorIndex=a,this.show=!0),console.log("ModalInfo:",this.modalInfo)},showDeleteModal:function(t){var e=this;this.$Modal.confirm({title:"删除确认!",content:'<p style="color: red">是否确认删除该楼层?</p>',width:300,onOk:function(){e.uploadData.items.splice(t,1),e.resourceService.addOrUpdateResourceDetail(e.uploadData).then(function(t){t&&200===t.code?(e.$Message.success(t.message||"修改成功!"),e.getResourceDetailList(),e.modalData=[],e.modalInfo={modalType:0,modalTitle:"",resContentId:0,floorIndex:-1,template_intro:"",template_name:""}):(console.log(t),e.$Message.error(t.message||"修改失败!"))})}})},onOk:function(){var t=this,e=this.$refs.addEditor.getValue();for(var a in e)if(""===e[a].url.url)return this.modalData=[],void this.$Message.error("请填写所有信息后再提交!");var o={id:this.modalInfo.resContentId,contentName:"楼层"+(this.floorList.length+1),templateKey:"123",contentData:n()({template_name:this.modalInfo.template_name,template_intro:this.modalInfo.template_intro,data:e}),type:this.modalInfo.modalType};-1===this.modalInfo.floorIndex?this.uploadData.items.push(o):(o=s()(o,{contentName:this.uploadData.items[this.modalInfo.floorIndex].contentName}),this.uploadData.items[this.modalInfo.floorIndex]=o),console.log("uploadData:",this.uploadData),this.resourceService.addOrUpdateResourceDetail(this.uploadData).then(function(e){console.log(e),e&&200===e.code?(t.$Message.success(e.message||"修改成功!"),t.getResourceDetailList(),t.modalData=[],t.modalInfo={modalType:0,modalTitle:"",resContentId:0,floorIndex:-1,template_intro:"",template_name:""},t.show=!1):(console.log(e),t.$Message.error(e.message||"修改失败!"))})},onCancel:function(){this.modalData=[],this.modalInfo={modalType:0,modalTitle:"",resContentId:0,floorIndex:-1,template_intro:"",template_name:""},this.show=!1}}}},344:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o=a(345),s=a(15);Object(s.a)(o.a)},345:function(t,e,a){"use strict";function o(t){n||a(346)}var s=a(134),i=a(347),n=!1,l=a(0),r=o,d=l(s.a,i.a,!1,r,null,null);d.options.__file="src/views/resource-edit-new/index.vue",e.a=d.exports},346:function(t,e){},347:function(t,e,a){"use strict";var o=function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("LayoutContent",{attrs:{breads:[{url:"resource-list.html",title:"资源位列表"},{title:"资源位编辑"}]}},[o("div",{staticClass:"main"},[o("div",{staticClass:"editor-container"},[o("Card",[o("p",{attrs:{slot:"title"},slot:"title"},[t._v(t._s(t.title))]),t._v(" "),t._l(t.floorList,function(e,s){return[o("div",{staticClass:"floor-item"},["singleImage"===e.template_name?o("div",{staticClass:"floor-image"},[o("img",{staticStyle:{width:"100%"},attrs:{src:e.data[0].src.split("?")[0]||a(33)}}),t._v(" "),o("div",{staticClass:"floor-mask"},[o("div",{staticClass:"floor-edit-buttons"},[o("a",{attrs:{href:"javascript:void(0)"},on:{click:function(a){t.showModal("singleImage",e,s)}}},[t._v("编 辑")]),t._v(" "),o("a",{staticStyle:{"background-color":"red"},attrs:{href:"javascript:void(0)"},on:{click:function(e){t.showDeleteModal(s)}}},[t._v("删 除")])])])]):t._e(),t._v(" "),"twoPicture"===e.template_name?o("div",{staticClass:"floor-image"},[o("img",{staticStyle:{width:"50%",height:"120px"},attrs:{src:e.data[0].src.split("?")[0]||a(33)}}),t._v(" "),o("img",{staticStyle:{width:"50%",height:"120px"},attrs:{src:e.data[1].src.split("?")[0]||a(33)}}),t._v(" "),o("div",{staticClass:"floor-mask"},[o("div",{staticClass:"floor-edit-buttons"},[o("a",{attrs:{href:"javascript:void(0)"},on:{click:function(a){t.showModal("twoPicture",e,s)}}},[t._v("编 辑")]),t._v(" "),o("a",{staticStyle:{"background-color":"red"},attrs:{href:"javascript:void(0)"},on:{click:function(e){t.showDeleteModal(s)}}},[t._v("删 除")])])])]):t._e()]),t._v(" "),o("divide")]})],2)],1),t._v(" "),o("div",{staticClass:"button-container"},[o("Button",{attrs:{type:"primary"},on:{click:function(e){t.showModal("singleImage",t.singleData,-1)}}},[t._v("一张图")]),t._v(" "),o("Button",{attrs:{type:"primary"},on:{click:function(e){t.showModal("twoPicture",t.twoData,-1)}}},[t._v("两张图")])],1),t._v(" "),o("Modal",{attrs:{title:t.modalInfo.modalTitle,width:"650"},on:{"on-ok":t.onOk,"on-cancel":t.onCancel},model:{value:t.show,callback:function(e){t.show=e},expression:"show"}},[o("banner-editor",{ref:"addEditor",attrs:{hideAddButton:!0,hideDeleteButton:!0},model:{value:t.modalData,callback:function(e){t.modalData=e},expression:"modalData"}})],1)],1)])},s=[];o._withStripped=!0;var i={render:o,staticRenderFns:s};e.a=i}},[344]);
\ No newline at end of file
... ...
webpackJsonp([6],{134:function(t,e,a){"use strict";var o=a(9),s=a.n(o),i=a(24),n=a.n(i),l=a(4),r=a(8),d=a(41),c=a(104),m=a(132);e.a={name:"resourceEditNew",components:{Divide:m.a,bannerEditor:d.a,SmartFloor:c.a},data:function(){return{title:"",list:[],floorList:[],modalInfo:{modalType:0,modalTitle:"",resContentId:0,floorIndex:-1,template_intro:"",template_name:""},singleData:{data:{0:{alt:"",bgColor:"",imgId:"0",src:"",url:{action:"go.h5",url:""}}},type:3,template_intro:"一张图",template_name:"singleImage",resContentId:0},twoData:{data:{0:{alt:"",bgColor:"",imgId:"0",src:"",url:{action:"go.h5",url:""}},1:{alt:"",bgColor:"",imgId:"0",src:"",url:{action:"go.h5",url:""}}},type:4,template_intro:"两张图",template_name:"twoPicture",resContentId:0},resId:null,bg:"",show:!1,modalData:[],uploadData:{id:l.a.getQueryString("id"),items:[]}}},mounted:function(){this.resId=l.a.getQueryString("id"),this.title=l.a.getQueryString("name"),this.resourceService=new r.a,this.getResourceDetailList()},methods:{getResourceDetailList:function(){var t=this;this.resourceService.info(this.resId).then(function(e){console.log(e),t.list=e,t.manageAllData(e),t.manageFloorList(e)})},manageAllData:function(t){this.uploadData.items=[];for(var e=0;e<t.length;e++){var a={id:t[e].resContentId,contentName:t[e].name,templateKey:"123",contentData:t[e].data,type:t[e].type};this.uploadData.items.push(a)}},manageFloorList:function(t){this.floorList=[];for(var e=0;e<t.length;e++){var a=JSON.parse(t[e].data);a.resContentId=t[e].resContentId,a.type=t[e].type,this.floorList.push(a),console.log("floorList:",this.floorList)}},showModal:function(t,e,a){console.log(e,a);var o=0,s="";for(var i in e.data){var n=e.data[i];this.modalData.push(n)}switch(console.log("modalData:",this.modalData),t){case"singleImage":o=3,s="一张图";break;case"twoPicture":o=4,s="两张图"}o&&(this.modalInfo.modalType=o,this.modalInfo.modalTitle=s,this.modalInfo.resContentId=e.resContentId,this.modalInfo.template_intro=e.template_intro,this.modalInfo.template_name=e.template_name,this.modalInfo.floorIndex=a,this.show=!0),console.log("ModalInfo:",this.modalInfo)},showDeleteModal:function(t){var e=this;this.$Modal.confirm({title:"删除确认!",content:'<p style="color: red">是否确认删除该楼层?</p>',width:300,onOk:function(){e.uploadData.items.splice(t,1),e.resourceService.addOrUpdateResourceDetail(e.uploadData).then(function(t){t&&200===t.code?(e.$Message.success(t.message||"修改成功!"),e.getResourceDetailList(),e.modalData=[],e.modalInfo={modalType:0,modalTitle:"",resContentId:0,floorIndex:-1,template_intro:"",template_name:""}):(console.log(t),e.$Message.error(t.message||"修改失败!"))})}})},onOk:function(){var t=this,e=this.$refs.addEditor.getValue();for(var a in e)if(""===e[a].url.url)return this.modalData=[],void this.$Message.error("请勿提交空数据");var o={id:this.modalInfo.resContentId,contentName:"楼层"+(this.floorList.length+1),templateKey:"123",contentData:n()({template_name:this.modalInfo.template_name,template_intro:this.modalInfo.template_intro,data:e}),type:this.modalInfo.modalType};-1===this.modalInfo.floorIndex?this.uploadData.items.push(o):(o=s()(o,{contentName:this.uploadData.items[this.modalInfo.floorIndex].contentName}),this.uploadData.items[this.modalInfo.floorIndex]=o),console.log("uploadData:",this.uploadData),this.resourceService.addOrUpdateResourceDetail(this.uploadData).then(function(e){console.log(e),e&&200===e.code?(t.$Message.success(e.message||"修改成功!"),t.getResourceDetailList(),t.modalData=[],t.modalInfo={modalType:0,modalTitle:"",resContentId:0,floorIndex:-1,template_intro:"",template_name:""},t.show=!1):(console.log(e),t.$Message.error(e.message||"修改失败!"))})},onCancel:function(){this.modalData=[],this.modalInfo={modalType:0,modalTitle:"",resContentId:0,floorIndex:-1,template_intro:"",template_name:""},this.show=!1}}}},344:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o=a(345),s=a(15);Object(s.a)(o.a)},345:function(t,e,a){"use strict";function o(t){n||a(346)}var s=a(134),i=a(347),n=!1,l=a(0),r=o,d=l(s.a,i.a,!1,r,null,null);d.options.__file="src/views/resource-edit-new/index.vue",e.a=d.exports},346:function(t,e){},347:function(t,e,a){"use strict";var o=function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("LayoutContent",{attrs:{breads:[{url:"resource-list.html",title:"资源位列表"},{title:"资源位编辑"}]}},[o("div",{staticClass:"main"},[o("div",{staticClass:"editor-container"},[o("Card",[o("p",{attrs:{slot:"title"},slot:"title"},[t._v(t._s(t.title))]),t._v(" "),t._l(t.floorList,function(e,s){return[o("div",{staticClass:"floor-item"},["singleImage"===e.template_name?o("div",{staticClass:"floor-image"},[o("img",{staticStyle:{width:"100%"},attrs:{src:e.data[0].src.split("?")[0]||a(33)}}),t._v(" "),o("div",{staticClass:"floor-mask"},[o("div",{staticClass:"floor-edit-buttons"},[o("a",{attrs:{href:"javascript:void(0)"},on:{click:function(a){t.showModal("singleImage",e,s)}}},[t._v("编 辑")]),t._v(" "),o("a",{staticStyle:{"background-color":"red"},attrs:{href:"javascript:void(0)"},on:{click:function(e){t.showDeleteModal(s)}}},[t._v("删 除")])])])]):t._e(),t._v(" "),"twoPicture"===e.template_name?o("div",{staticClass:"floor-image"},[o("img",{staticStyle:{width:"50%",height:"120px"},attrs:{src:e.data[0].src.split("?")[0]||a(33)}}),t._v(" "),o("img",{staticStyle:{width:"50%",height:"120px"},attrs:{src:e.data[1].src.split("?")[0]||a(33)}}),t._v(" "),o("div",{staticClass:"floor-mask"},[o("div",{staticClass:"floor-edit-buttons"},[o("a",{attrs:{href:"javascript:void(0)"},on:{click:function(a){t.showModal("twoPicture",e,s)}}},[t._v("编 辑")]),t._v(" "),o("a",{staticStyle:{"background-color":"red"},attrs:{href:"javascript:void(0)"},on:{click:function(e){t.showDeleteModal(s)}}},[t._v("删 除")])])])]):t._e()]),t._v(" "),o("divide")]})],2)],1),t._v(" "),o("div",{staticClass:"button-container"},[o("Button",{attrs:{type:"primary"},on:{click:function(e){t.showModal("singleImage",t.singleData,-1)}}},[t._v("一张图")]),t._v(" "),o("Button",{attrs:{type:"primary"},on:{click:function(e){t.showModal("twoPicture",t.twoData,-1)}}},[t._v("两张图")])],1),t._v(" "),o("Modal",{attrs:{title:t.modalInfo.modalTitle,width:"650"},on:{"on-ok":t.onOk,"on-cancel":t.onCancel},model:{value:t.show,callback:function(e){t.show=e},expression:"show"}},[o("banner-editor",{ref:"addEditor",attrs:{hideAddButton:!0,hideDeleteButton:!0},model:{value:t.modalData,callback:function(e){t.modalData=e},expression:"modalData"}})],1)],1)])},s=[];o._withStripped=!0;var i={render:o,staticRenderFns:s};e.a=i}},[344]);
\ No newline at end of file
... ... @@ -5,10 +5,10 @@
<title>ufo后台管理</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
<link href="css/vendors.e025e652173e64d52029.css" rel="stylesheet"><link href="css/price-compare.e025e652173e64d52029.css" rel="stylesheet"></head>
<link href="css/vendors.a4e4065cb3a310f8e68a.css" rel="stylesheet"><link href="css/price-compare.a4e4065cb3a310f8e68a.css" rel="stylesheet"></head>
<body>
<div id="app"></div>
<script type="text/javascript" src="js/vendors.e025e652173e64d52029.js"></script><script type="text/javascript" src="js/price-compare.e025e652173e64d52029.js"></script></body>
<script type="text/javascript" src="js/vendors.a4e4065cb3a310f8e68a.js"></script><script type="text/javascript" src="js/price-compare.a4e4065cb3a310f8e68a.js"></script></body>
</html>
\ No newline at end of file
... ...
... ... @@ -5,10 +5,10 @@
<title>ufo后台管理</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
<link href="css/vendors.e025e652173e64d52029.css" rel="stylesheet"><link href="css/resource-edit-new.e025e652173e64d52029.css" rel="stylesheet"></head>
<link href="css/vendors.a4e4065cb3a310f8e68a.css" rel="stylesheet"><link href="css/resource-edit-new.a4e4065cb3a310f8e68a.css" rel="stylesheet"></head>
<body>
<div id="app"></div>
<script type="text/javascript" src="js/vendors.e025e652173e64d52029.js"></script><script type="text/javascript" src="js/resource-edit-new.e025e652173e64d52029.js"></script></body>
<script type="text/javascript" src="js/vendors.a4e4065cb3a310f8e68a.js"></script><script type="text/javascript" src="js/resource-edit-new.a4e4065cb3a310f8e68a.js"></script></body>
</html>
\ No newline at end of file
... ...
... ... @@ -5,10 +5,10 @@
<title>ufo后台管理</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
<link href="css/vendors.e025e652173e64d52029.css" rel="stylesheet"><link href="css/resource-edit.e025e652173e64d52029.css" rel="stylesheet"></head>
<link href="css/vendors.a4e4065cb3a310f8e68a.css" rel="stylesheet"><link href="css/resource-edit.a4e4065cb3a310f8e68a.css" rel="stylesheet"></head>
<body>
<div id="app"></div>
<script type="text/javascript" src="js/vendors.e025e652173e64d52029.js"></script><script type="text/javascript" src="js/resource-edit.e025e652173e64d52029.js"></script></body>
<script type="text/javascript" src="js/vendors.a4e4065cb3a310f8e68a.js"></script><script type="text/javascript" src="js/resource-edit.a4e4065cb3a310f8e68a.js"></script></body>
</html>
\ No newline at end of file
... ...
... ... @@ -5,10 +5,10 @@
<title>ufo后台管理</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
<link href="css/vendors.e025e652173e64d52029.css" rel="stylesheet"><link href="css/resource-list.e025e652173e64d52029.css" rel="stylesheet"></head>
<link href="css/vendors.a4e4065cb3a310f8e68a.css" rel="stylesheet"><link href="css/resource-list.a4e4065cb3a310f8e68a.css" rel="stylesheet"></head>
<body>
<div id="app"></div>
<script type="text/javascript" src="js/vendors.e025e652173e64d52029.js"></script><script type="text/javascript" src="js/resource-list.e025e652173e64d52029.js"></script></body>
<script type="text/javascript" src="js/vendors.a4e4065cb3a310f8e68a.js"></script><script type="text/javascript" src="js/resource-list.a4e4065cb3a310f8e68a.js"></script></body>
</html>
\ No newline at end of file
... ...
... ... @@ -5,10 +5,10 @@
<title>ufo后台管理</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
<link href="css/vendors.e025e652173e64d52029.css" rel="stylesheet"><link href="css/send-record.e025e652173e64d52029.css" rel="stylesheet"></head>
<link href="css/vendors.a4e4065cb3a310f8e68a.css" rel="stylesheet"><link href="css/send-record.a4e4065cb3a310f8e68a.css" rel="stylesheet"></head>
<body>
<div id="app"></div>
<script type="text/javascript" src="js/vendors.e025e652173e64d52029.js"></script><script type="text/javascript" src="js/send-record.e025e652173e64d52029.js"></script></body>
<script type="text/javascript" src="js/vendors.a4e4065cb3a310f8e68a.js"></script><script type="text/javascript" src="js/send-record.a4e4065cb3a310f8e68a.js"></script></body>
</html>
\ No newline at end of file
... ...
... ... @@ -5,10 +5,10 @@
<title>ufo后台管理</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
<link href="css/vendors.e025e652173e64d52029.css" rel="stylesheet"><link href="css/shop.e025e652173e64d52029.css" rel="stylesheet"></head>
<link href="css/vendors.a4e4065cb3a310f8e68a.css" rel="stylesheet"><link href="css/shop.a4e4065cb3a310f8e68a.css" rel="stylesheet"></head>
<body>
<div id="app"></div>
<script type="text/javascript" src="js/vendors.e025e652173e64d52029.js"></script><script type="text/javascript" src="js/shop.e025e652173e64d52029.js"></script></body>
<script type="text/javascript" src="js/vendors.a4e4065cb3a310f8e68a.js"></script><script type="text/javascript" src="js/shop.a4e4065cb3a310f8e68a.js"></script></body>
</html>
\ No newline at end of file
... ...