提交 51c440b9 编写于 作者: M maguohua

udate

上级 f791bd08
......@@ -264,6 +264,8 @@ npm run build
## 订单列表页
<img src="https://github.com/bailicangdu/vue2-elm/blob/master/screenshots/order.png" width="365" height="619"/>
<img src="https://github.com/bailicangdu/vue2-elm/blob/master/screenshots/order2.png" width="365" height="619"/>
......
a,article,aside,b,body,button,dd,div,dl,dt,figcaption,figure,footer,h1,h2,h3,h4,h5,h6,header,i,input,li,nav,p,section,select,span,textarea,ul{padding:0;margin:0;list-style:none;font-style:normal;text-decoration:none;border:none;color:#333;box-sizing:border-box;font-family:Microsoft Yahei,sans-serif;-webkit-tap-highlight-color:transparent;-webkit-font-smoothing:antialiased}a:focus,article:focus,aside:focus,b:focus,body:focus,button:focus,dd:focus,div:focus,dl:focus,dt:focus,figcaption:focus,figure:focus,footer:focus,h1:focus,h2:focus,h3:focus,h4:focus,h5:focus,h6:focus,header:focus,i:focus,input:focus,li:focus,nav:focus,p:focus,section:focus,select:focus,span:focus,textarea:focus,ul:focus{outline:none}::-webkit-scrollbar{width:0;height:0;background-color:#f5f5f5}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 1px transparent;border-radius:10px;background-color:#f5f5f5}::-webkit-scrollbar-thumb{border-radius:10px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);background-color:#555}input[type=button],input[type=reset],input[type=search],input[type=submit],textarea{-webkit-appearance:none}body,html{height:100%;width:100%;background-color:#f2f2f2}.clear:after{content:'';display:block;clear:both}.clear{zoom:1}.back_img{background-repeat:no-repeat;background-size:100% 100%}.margin{margin:0 auto}.left{float:left}.right{float:right}.hide{display:none}.show{display:block}.ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.paddingTop{padding-top:1.95rem}.router-fade-enter-active,.router-fade-leave-active{-webkit-transition:opacity .4s;transition:opacity .4s}.router-fade-enter,.router-fade-leave-active{opacity:0}
\ No newline at end of file
a,article,aside,b,body,button,dd,div,dl,dt,figcaption,figure,footer,h1,h2,h3,h4,h5,h6,header,i,input,li,nav,p,section,select,span,textarea,ul{padding:0;margin:0;list-style:none;font-style:normal;text-decoration:none;border:none;color:#333;box-sizing:border-box;font-family:Microsoft Yahei,sans-serif;-webkit-tap-highlight-color:transparent;-webkit-font-smoothing:antialiased}a:focus,article:focus,aside:focus,b:focus,body:focus,button:focus,dd:focus,div:focus,dl:focus,dt:focus,figcaption:focus,figure:focus,footer:focus,h1:focus,h2:focus,h3:focus,h4:focus,h5:focus,h6:focus,header:focus,i:focus,input:focus,li:focus,nav:focus,p:focus,section:focus,select:focus,span:focus,textarea:focus,ul:focus{outline:none}::-webkit-scrollbar{width:0;height:0;background-color:#f5f5f5}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 1px transparent;border-radius:10px;background-color:#f5f5f5}::-webkit-scrollbar-thumb{border-radius:10px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);background-color:#555}input[type=button],input[type=reset],input[type=search],input[type=submit],textarea{-webkit-appearance:none}body,html{height:100%;width:100%;background-color:#f2f2f2}.clear:after{content:'';display:block;clear:both}.clear{zoom:1}.back_img{background-repeat:no-repeat;background-size:100% 100%}.margin{margin:0 auto}.left{float:left}.right{float:right}.hide{display:none}.show{display:block}.ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.paddingTop{padding-top:1.95rem}.router-fade-enter-active,.router-fade-leave-active{-webkit-transition:opacity .3s;transition:opacity .3s}.router-fade-enter,.router-fade-leave-active{opacity:0}
\ No newline at end of file
此差异已折叠。
webpackJsonp([17,29],{3:function(t,e,a){"use strict";function i(t){return t&&t.__esModule?t:{default:t}}e.__esModule=!0;var o=a(10),r=i(o);e.default=r.default||function(t){for(var e=1;e<arguments.length;e++){var a=arguments[e];for(var i in a)Object.prototype.hasOwnProperty.call(a,i)&&(t[i]=a[i])}return t}},5:function(t,e,a){"use strict";function i(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var o=a(3),r=i(o),n=a(4);e.default={data:function(){return{}},created:function(){this.getUserInfo()},mounted:function(){},props:["signinUp","headTitle","goBack"],computed:(0,r.default)({},(0,n.mapState)(["userInfo"])),methods:(0,r.default)({},(0,n.mapActions)(["getUserInfo"]))}},6:function(t,e,a){e=t.exports=a(1)(),e.push([t.id,"#head_top[data-v-9225d752]{background-color:#3190e8;position:fixed;z-index:100;left:0;top:0;width:100%;height:1.95rem}.head_goback[data-v-9225d752]{left:.4rem;width:.6rem;height:.8rem}.head_goback[data-v-9225d752],.head_login[data-v-9225d752]{position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.head_login[data-v-9225d752]{right:.55rem;font-size:.65rem;color:#fff}.head_login .login_span[data-v-9225d752]{color:#fff}.head_login .user_avatar[data-v-9225d752]{fill:#fff;width:.8rem;height:.8rem}.title_head[data-v-9225d752]{position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:50%;color:#fff;text-align:center}.title_head .title_text[data-v-9225d752]{font-size:.8rem;color:#fff;text-align:center;font-weight:700}","",{version:3,sources:["/./src/components/header/head.vue"],names:[],mappings:"AACA,2BAA2B,yBAAyB,eAAe,YAAY,OAAO,MAAM,WAAW,cAAc,CACpH,AACD,8BAA8B,WAAY,YAAY,YAAa,CAClE,AACD,2DAFmE,kBAAkB,QAAQ,mCAAmC,AAA+B,0BAA0B,CAGxL,AADD,6BAA6B,aAAc,iBAAiB,UAAW,CACtE,AACD,yCAAyC,UAAU,CAClD,AACD,0CAA0C,UAAU,YAAY,YAAY,CAC3E,AACD,6BAA6B,kBAAkB,QAAQ,SAAS,uCAAwC,AAAoC,+BAAgC,UAAU,WAAW,iBAAiB,CACjN,AACD,yCAAyC,gBAAgB,WAAW,kBAAkB,eAAgB,CACrG",file:"head.vue",sourcesContent:["\n#head_top[data-v-9225d752]{background-color:#3190e8;position:fixed;z-index:100;left:0;top:0;width:100%;height:1.95rem\n}\n.head_goback[data-v-9225d752]{left:0.4rem;width:.6rem;height:.8rem;position:absolute;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%)\n}\n.head_login[data-v-9225d752]{right:0.55rem;font-size:.65rem;color:#fff;position:absolute;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%)\n}\n.head_login .login_span[data-v-9225d752]{color:#fff\n}\n.head_login .user_avatar[data-v-9225d752]{fill:#fff;width:.8rem;height:.8rem\n}\n.title_head[data-v-9225d752]{position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%, -50%);-ms-transform:translate(-50%, -50%);transform:translate(-50%, -50%);width:50%;color:#fff;text-align:center\n}\n.title_head .title_text[data-v-9225d752]{font-size:.8rem;color:#fff;text-align:center;font-weight:bold\n}\n"],sourceRoot:"webpack://"}])},7:function(t,e,a){var i=a(6);"string"==typeof i&&(i=[[t.id,i,""]]);a(2)(i,{});i.locals&&(t.exports=i.locals)},8:function(t,e,a){var i,o;a(7),i=a(5);var r=a(9);o=i=i||{},"object"!=typeof i.default&&"function"!=typeof i.default||(o=i=i.default),"function"==typeof o&&(o=o.options),o.render=r.render,o.staticRenderFns=r.staticRenderFns,o._scopeId="data-v-9225d752",t.exports=i},9:function(t,e){t.exports={render:function(){var t=this,e=t.$createElement;return e("header",{attrs:{id:"head_top"}},[t._t("logo")," ",t._t("search")," ",t.goBack?e("section",{staticClass:"head_goback",on:{click:function(e){t.$router.go(-1)}}},[e("svg",{attrs:{width:"100%",height:"100%",xmlns:"http://www.w3.org/2000/svg",version:"1.1"}},[e("polyline",{staticStyle:{fill:"none",stroke:"rgb(255,255,255)","stroke-width":"2"},attrs:{points:"12,18 4,9 12,0"}})])]):t._e()," ",t.signinUp?e("router-link",{staticClass:"head_login",attrs:{to:t.userInfo?"/profile":"/login"}},[t.userInfo?e("svg",{staticClass:"user_avatar"},[e("use",{attrs:{"xmlns:xlink":"http://www.w3.org/1999/xlink","xlink:href":"#user"}})]):e("span",{staticClass:"login_span"},["登陆|注册"])," "]):t._e()," ",t.headTitle?e("section",{staticClass:"title_head ellipsis"},[e("span",{staticClass:"title_text"},[t._s(t.headTitle)])]):t._e()," ",t._t("msite-title")," ",t._t("changecity")," ",t._t("changeLogin")])},staticRenderFns:[]}},11:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.getImgPath=e.loadMore=void 0;var i=a(12),o=a(13);e.loadMore={directives:{"load-more":{bind:function(t,e){var a=window.screen.height,o=void 0,r=void 0,n=void 0,A=void 0,d=void 0,s=void 0,l=void 0,p=void 0,f=t.attributes.type&&t.attributes.type.value,c=2;2==f?(l=t,p=t.children[0]):(l=document.body,p=t),t.addEventListener("touchstart",function(){o=p.clientHeight,2==f&&(o=o),r=t.offsetTop,n=(0,i.getStyle)(t,"paddingBottom"),A=(0,i.getStyle)(t,"marginBottom")},!1),t.addEventListener("touchmove",function(){g()},!1),t.addEventListener("touchend",function(){s=l.scrollTop,h()},!1);var h=function t(){d=requestAnimationFrame(function(){l.scrollTop!=s?(s=l.scrollTop,t()):(cancelAnimationFrame(d),o=p.clientHeight,g())})},g=function(){l.scrollTop+a>=o+r+n+A-c&&e.value()}}}}},e.getImgPath={methods:{getImgPath:function(t){var e=void 0;if(!t)return"http://test.fe.ptdev.cn/elm/elmlogo.jpeg";e=t.indexOf("jpeg")!==-1?".jpeg":".png";var a="/"+t.substr(0,1)+"/"+t.substr(1,2)+"/"+t.substr(3)+e;return o.imgBaseUrl+a}}}},129:function(t,e,a){"use strict";function i(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var o=a(8),r=i(o),n=a(11);e.default={data:function(){return{}},created:function(){},mixins:[n.getImgPath],components:{headTop:r.default},props:[],methods:{}}},209:function(t,e,a){e=t.exports=a(1)(),e.push([t.id,".info_page[data-v-3b19a086]{position:absolute;top:0;left:0;right:0;bottom:0;background-color:#f2f2f2;z-index:202;padding-top:1.95rem}.info_page p[data-v-3b19a086],.info_page span[data-v-3b19a086]{font-family:Helvetica Neue,Tahoma,Arial}.profile-info[data-v-3b19a086]{width:100%;height:3.1rem}.profile-info .profileinfopanel-upload[data-v-3b19a086]{display:block;position:absolute;opacity:0;top:2.35rem;left:0;width:100%;height:3.1rem}.profile-info .headportrait[data-v-3b19a086]{margin-top:.4rem;padding:.5rem .4rem;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-top:1px solid #ddd;background:#fff}.profile-info .headportrait[data-v-3b19a086],.profile-info .headportrait h2[data-v-3b19a086]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.profile-info .headportrait h2[data-v-3b19a086]{font-size:.6rem;color:#333;font-weight:500}.profile-info .headportrait .headportrait-div span[data-v-3b19a086]{display:inline-block}.profile-info .headportrait .headportrait-div span svg[data-v-3b19a086]{width:100%;height:100%}.profile-info .headportrait .headportrait-div .headportrait-div-top[data-v-3b19a086]{width:2rem;height:2rem;vertical-align:middle}.profile-info .headportrait .headportrait-div .headportrait-div-bottom[data-v-3b19a086]{width:.66667rem;height:1.4rem;position:relative;top:.44rem}.profile-info .headportraitwo[data-v-3b19a086]{margin-top:0;padding:.3rem .4rem}.profile-info .headportraitwo .headportrait-div[data-v-3b19a086]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:left;-ms-flex-pack:left;justify-content:left}.profile-info .headportraitwo .headportrait-div p[data-v-3b19a086]{text-align:left;line-height:1.39rem;font-size:.7rem;color:#999;margin-right:.2rem;font-weight:100;font-family:Arial}.profile-info .headportraitwo .headportrait-div .headportrait-div-bottom[data-v-3b19a086]{top:0}.profile-info .headportraithree[data-v-3b19a086]{border-bottom:1px solid #ddd}.profile-info .bind-phone[data-v-3b19a086]{padding:.4rem;font-size:.5rem;color:#666}.profile-info .exitlogin[data-v-3b19a086]{width:96%;margin:1.3rem auto 0;line-height:1.5rem;border-radius:5px;text-align:center;background:#d8584a;font-size:.6rem;color:#fff}.profile-info .exitlogin[data-v-3b19a086]:active{opacity:.8}.info-router[data-v-3b19a086]{display:block}","",{version:3,sources:["/./src/page/profile/children/info.vue"],names:[],mappings:"AACA,4BAA4B,kBAAkB,MAAM,OAAO,QAAQ,SAAS,yBAAyB,YAAY,mBAAmB,CACnI,AACD,+DAA+D,uCAAuC,CACrG,AACD,+BAA+B,WAAW,aAAa,CACtD,AACD,wDAAwD,cAAc,kBAAkB,UAAU,YAAY,OAAO,WAAW,aAAa,CAC5I,AACD,6CAA6C,iBAAiB,oBAAoB,AAA0E,yBAAyB,AAAsC,sBAAsB,8BAA8B,AAA6F,0BAA0B,eAAe,CACpZ,AACD,6FAFkF,oBAAoB,AAAqB,oBAAoB,aAAa,AAAmH,yBAAyB,AAA2B,sBAAsB,kBAAmB,CAG3W,AADD,gDAAgD,gBAAgB,WAAW,eAAgB,CAC1F,AACD,oEAAoE,oBAAoB,CACvF,AACD,wEAAwE,WAAW,WAAW,CAC7F,AACD,qFAAqF,WAAW,YAAY,qBAAqB,CAChI,AACD,wFAAwF,gBAAgB,cAAc,kBAAkB,UAAW,CAClJ,AACD,+CAA+C,aAAa,mBAAmB,CAC9E,AACD,iEAAiE,oBAAoB,AAAqB,oBAAoB,aAAa,sBAAsB,AAA6B,mBAAmB,oBAAoB,CACpO,AACD,mEAAmE,gBAAgB,oBAAoB,gBAAgB,WAAW,mBAAmB,gBAAgB,iBAAiB,CACrL,AACD,0FAA0F,KAAK,CAC9F,AACD,iDAAiD,4BAA4B,CAC5E,AACD,2CAA2C,cAAoB,gBAAgB,UAAU,CACxF,AACD,0CAA0C,UAAU,qBAAqB,mBAAmB,kBAAkB,kBAAkB,mBAAmB,gBAAgB,UAAU,CAC5K,AACD,iDAAiD,UAAU,CAC1D,AACD,8BAA8B,aAAa,CAC1C",file:"info.vue",sourcesContent:["\n.info_page[data-v-3b19a086]{position:absolute;top:0;left:0;right:0;bottom:0;background-color:#f2f2f2;z-index:202;padding-top:1.95rem\n}\n.info_page p[data-v-3b19a086],.info_page span[data-v-3b19a086]{font-family:Helvetica Neue,Tahoma,Arial\n}\n.profile-info[data-v-3b19a086]{width:100%;height:3.1rem\n}\n.profile-info .profileinfopanel-upload[data-v-3b19a086]{display:block;position:absolute;opacity:0;top:2.35rem;left:0;width:100%;height:3.1rem\n}\n.profile-info .headportrait[data-v-3b19a086]{margin-top:.4rem;padding:.5rem .4rem;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;border-top:1px solid #ddd;background:#fff\n}\n.profile-info .headportrait h2[data-v-3b19a086]{font-size:.6rem;color:#333;font-weight:500;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center\n}\n.profile-info .headportrait .headportrait-div span[data-v-3b19a086]{display:inline-block\n}\n.profile-info .headportrait .headportrait-div span svg[data-v-3b19a086]{width:100%;height:100%\n}\n.profile-info .headportrait .headportrait-div .headportrait-div-top[data-v-3b19a086]{width:2rem;height:2rem;vertical-align:middle\n}\n.profile-info .headportrait .headportrait-div .headportrait-div-bottom[data-v-3b19a086]{width:.66667rem;height:1.4rem;position:relative;top:0.44rem\n}\n.profile-info .headportraitwo[data-v-3b19a086]{margin-top:0;padding:.3rem .4rem\n}\n.profile-info .headportraitwo .headportrait-div[data-v-3b19a086]{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:left;-webkit-justify-content:left;-ms-flex-pack:left;justify-content:left\n}\n.profile-info .headportraitwo .headportrait-div p[data-v-3b19a086]{text-align:left;line-height:1.39rem;font-size:.7rem;color:#999;margin-right:.2rem;font-weight:100;font-family:Arial\n}\n.profile-info .headportraitwo .headportrait-div .headportrait-div-bottom[data-v-3b19a086]{top:0\n}\n.profile-info .headportraithree[data-v-3b19a086]{border-bottom:1px solid #ddd\n}\n.profile-info .bind-phone[data-v-3b19a086]{padding:.4rem .4rem;font-size:.5rem;color:#666\n}\n.profile-info .exitlogin[data-v-3b19a086]{width:96%;margin:1.3rem auto 0;line-height:1.5rem;border-radius:5px;text-align:center;background:#d8584a;font-size:.6rem;color:#fff\n}\n.profile-info .exitlogin[data-v-3b19a086]:active{opacity:.8\n}\n.info-router[data-v-3b19a086]{display:block\n}\n"],sourceRoot:"webpack://"}])},240:function(t,e,a){var i=a(209);"string"==typeof i&&(i=[[t.id,i,""]]);a(2)(i,{});i.locals&&(t.exports=i.locals)},270:function(t,e){t.exports="data:image/png;base64,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"},293:function(t,e,a){var i,o;a(240),i=a(129);var r=a(311);o=i=i||{},"object"!=typeof i.default&&"function"!=typeof i.default||(o=i=i.default),"function"==typeof o&&(o=o.options),o.render=r.render,o.staticRenderFns=r.staticRenderFns,o._scopeId="data-v-3b19a086",t.exports=i},311:function(t,e,a){t.exports={render:function(){var t=this,e=t.$createElement;return e("div",{staticClass:"info_page"},[e("head-top",{attrs:{"head-title":"账户信息","go-back":"true"}})," ",e("section",{staticClass:"profile-info"},[e("section",{staticClass:"headportrait"},[e("input",{staticClass:"profileinfopanel-upload",attrs:{type:"file"}})," ",e("h2",["头像"])," ",e("div",{staticClass:"headportrait-div"},[e("span",{staticClass:"headportrait-div-top"},[e("svg",{},[e("use",{attrs:{"xmlns:xlink":"http://www.w3.org/1999/xlink","xlink:href":"#avatar-default"}})])])," ",e("span",{staticClass:"headportrait-div-bottom"},[e("svg",{attrs:{fill:"#d8d8d8"}},[e("use",{attrs:{"xmlns:xlink":"http://www.w3.org/1999/xlink","xlink:href":"#arrow-right"}})])])])])," ",e("router-link",{staticClass:"info-router",attrs:{to:""}},[e("section",{staticClass:"headportrait headportraitwo"},[e("h2",["用户名"])," ",e("div",{staticClass:"headportrait-div"},[e("p",["fhsdfhdj"])," ",e("span",{staticClass:"headportrait-div-bottom"},[e("svg",{attrs:{fill:"#d8d8d8"}},[e("use",{attrs:{"xmlns:xlink":"http://www.w3.org/1999/xlink","xlink:href":"#arrow-right"}})])])])])])," ",e("router-link",{staticClass:"info-router",attrs:{to:""}},[e("section",{staticClass:"headportrait headportraitwo headportraithree"},[e("h2",["收货地址"])," ",e("div",{staticClass:"headportrait-div"},[e("span",{staticClass:"headportrait-div-bottom"},[e("svg",{attrs:{fill:"#d8d8d8"}},[e("use",{attrs:{"xmlns:xlink":"http://www.w3.org/1999/xlink","xlink:href":"#arrow-right"}})])])])])])," ",e("section",{staticClass:"bind-phone"},["\n 账号绑定\n "])," ",e("router-link",{staticClass:"info-router",attrs:{to:""}},[e("section",{staticClass:"headportrait headportraitwo headportraithree"},[e("h2",[e("img",{staticStyle:{display:"inline-block","margin-right":".4rem"},attrs:{src:a(270),alt:""}}),"手机"])," ",e("div",{staticClass:"headportrait-div"},[e("p",["15800319949"])," ",e("span",{staticClass:"headportrait-div-bottom"},[e("svg",{attrs:{fill:"#d8d8d8"}},[e("use",{attrs:{"xmlns:xlink":"http://www.w3.org/1999/xlink","xlink:href":"#arrow-right"}})])])])])])," ",e("section",{staticClass:"bind-phone"},["\n 安全设置\n "])," ",e("router-link",{staticClass:"info-router",attrs:{to:""}},[e("section",{staticClass:"headportrait headportraitwo headportraithree"},[e("h2",["登录密码"])," ",e("div",{staticClass:"headportrait-div"},[e("p",["修改"])," ",e("span",{staticClass:"headportrait-div-bottom"},[e("svg",{attrs:{fill:"#d8d8d8"}},[e("use",{attrs:{"xmlns:xlink":"http://www.w3.org/1999/xlink","xlink:href":"#arrow-right"}})])])])])])," ",e("section",{staticClass:"exitlogin"},["退出登录"])])])},staticRenderFns:[]}}});
\ No newline at end of file
此差异已折叠。
!function(e){function a(c){if(d[c])return d[c].exports;var f=d[c]={exports:{},id:c,loaded:!1};return e[c].call(f.exports,f,f.exports,a),f.loaded=!0,f.exports}var c=window.webpackJsonp;window.webpackJsonp=function(r,o){for(var t,n,b=0,i=[];b<r.length;b++)n=r[b],f[n]&&i.push.apply(i,f[n]),f[n]=0;for(t in o)e[t]=o[t];for(c&&c(r,o);i.length;)i.shift().call(null,a);if(o[0])return d[0]=0,a(0)};var d={},f={29:0};a.e=function(e,c){if(0===f[e])return c.call(null,a);if(void 0!==f[e])f[e].push(c);else{f[e]=[c];var d=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.src=a.p+"static/js/"+({0:"msite",1:"shop",2:"food",3:"confirmOrder",4:"foodDetail",5:"order",6:"orderDetail",7:"profile",8:"find",9:"remark",10:"payment",11:"chooseAddress",12:"addAddress",13:"search",14:"login",15:"forget",16:"userValidation",17:"info",18:"shopDetail",19:"shopSafe",20:"service",21:"points",22:"benefit",23:"balance",24:"home",25:"invoice",26:"searchAddress",27:"city",28:"vipcard",30:"vendor",31:"app"}[e]||e)+"."+{0:"2da51b2fca539ccfe187",1:"398bee0293ee683a0d37",2:"14e9ac2b32931764f7f0",3:"d6880498cf33c672e193",4:"3db0067c7d46949eda12",5:"51869362765550abb914",6:"4119f831d4a04a6ade5a",7:"4c8cc3754196eda38f39",8:"14976ba2f2c0544e00f8",9:"7a47757c4d95610ba3b8",10:"daf006a0613a9b02b1bf",11:"1aa2a8d84c23e9a206bf",12:"f355a7834d893f0ac341",13:"7fc133c925a3f9ee2cb1",14:"caf39d1d24aa06ccca23",15:"d0e5db0c2ee0692af314",16:"e54badfb5ebf27f207f9",17:"10c0ec3511bb3212eea3",18:"956a2c8db0881b069552",19:"e874636445d5e5717c6a",20:"e665079aa64f40e4f944",21:"4d271d27370a472c9a00",22:"cc73c6ba47af18d1444e",23:"4acabcabe86768aaeae9",24:"8967ad5f8f1a848c607a",25:"ea0e1d7d397c93df1736",26:"6ab0c3121110008ee2e5",27:"3e6410d5c29bc54b154e",28:"f5e6279aa705a31c1d48",30:"c5ceb309becd31fe4b42",31:"c41f56b128340b812599"}[e]+".min.js",d.appendChild(r)}},a.m=e,a.c=d,a.p="/elm/"}([]);
\ No newline at end of file
!function(e){function a(c){if(d[c])return d[c].exports;var f=d[c]={exports:{},id:c,loaded:!1};return e[c].call(f.exports,f,f.exports,a),f.loaded=!0,f.exports}var c=window.webpackJsonp;window.webpackJsonp=function(r,o){for(var b,t,n=0,i=[];n<r.length;n++)t=r[n],f[t]&&i.push.apply(i,f[t]),f[t]=0;for(b in o)e[b]=o[b];for(c&&c(r,o);i.length;)i.shift().call(null,a);if(o[0])return d[0]=0,a(0)};var d={},f={29:0};a.e=function(e,c){if(0===f[e])return c.call(null,a);if(void 0!==f[e])f[e].push(c);else{f[e]=[c];var d=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.src=a.p+"static/js/"+({0:"msite",1:"shop",2:"food",3:"confirmOrder",4:"foodDetail",5:"order",6:"orderDetail",7:"profile",8:"find",9:"remark",10:"payment",11:"chooseAddress",12:"addAddress",13:"search",14:"login",15:"forget",16:"userValidation",17:"info",18:"shopDetail",19:"shopSafe",20:"service",21:"points",22:"benefit",23:"balance",24:"home",25:"invoice",26:"searchAddress",27:"city",28:"vipcard",30:"vendor",31:"app"}[e]||e)+"."+{0:"2c5c5a5db8e404e00584",1:"3764507f0825dadecc86",2:"66cbe37013ac8be459b6",3:"d6880498cf33c672e193",4:"3db0067c7d46949eda12",5:"00bb89a5c7f17de15117",6:"4119f831d4a04a6ade5a",7:"e8bf2d5bc15fd4699017",8:"14976ba2f2c0544e00f8",9:"7a47757c4d95610ba3b8",10:"daf006a0613a9b02b1bf",11:"1aa2a8d84c23e9a206bf",12:"f355a7834d893f0ac341",13:"7fc133c925a3f9ee2cb1",14:"caf39d1d24aa06ccca23",15:"d0e5db0c2ee0692af314",16:"e54badfb5ebf27f207f9",17:"edfdf70023d4c9e0003c",18:"956a2c8db0881b069552",19:"e874636445d5e5717c6a",20:"e665079aa64f40e4f944",21:"4d271d27370a472c9a00",22:"cc73c6ba47af18d1444e",23:"4acabcabe86768aaeae9",24:"4f3c72ab1b5dfc9a4ddb",25:"ea0e1d7d397c93df1736",26:"6ab0c3121110008ee2e5",27:"3e6410d5c29bc54b154e",28:"f5e6279aa705a31c1d48",30:"c5ceb309becd31fe4b42",31:"a54bb9400285ff43e595"}[e]+".min.js",d.appendChild(r)}},a.m=e,a.c=d,a.p="/elm/"}([]);
\ No newline at end of file
......@@ -17,7 +17,7 @@
<style lang="scss">
@import './style/common';
.router-fade-enter-active, .router-fade-leave-active {
transition: opacity .4s;
transition: opacity .3s;
}
.router-fade-enter, .router-fade-leave-active {
opacity: 0;
......
......@@ -110,7 +110,7 @@ export default {
this.showLoading = true;
let res = await shopList(this.latitude, this.longitude, this.offset, this.restaurantCategoryId);
this.shopListArr = this.shopListArr.concat(res);
this.hideLoading();
this.showLoading = false;
//当获取数据小于20,说明没有更多数据,不需要再次请求数据
if (res.length < 20) {
return
......@@ -232,6 +232,7 @@ export default {
padding: 0.04rem 0.08rem 0;
border-radius: 0.08rem;
margin-left: 0.08rem;
border: 1px;
}
.delivery_left{
color: #fff;
......@@ -248,9 +249,12 @@ export default {
margin-top: 0.52rem;
@include fj;
@include sc(0.5rem, #666);
.fee{
@include sc(0.5rem, #666);
}
.distance_time{
span{
color: #888;
color: #999;
}
.order_time{
color: $blue;
......
......@@ -3,8 +3,14 @@ import VueRouter from 'vue-router'
import routes from './router/router'
import store from './store/'
import {routerMode} from './config/env'
import fastclick from 'fastclick'
import './config/rem'
import FastClick from 'fastclick'
if ('addEventListener' in document) {
document.addEventListener('DOMContentLoaded', function() {
FastClick.attach(document.body);
}, false);
}
Vue.use(VueRouter)
......
......@@ -10,7 +10,9 @@
</div>
<router-link :to="'/city/' + guessCityid" class="guess_city">
<span>{{guessCity}}</span>
<span>></span>
<svg class="arrow_right">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#arrow-right"></use>
</svg>
</router-link>
</nav>
<section id="hot_city_container">
......@@ -118,8 +120,7 @@ export default {
background-color: #fff;
margin-bottom: 0.4rem;
.city_tip{
display: flex;
justify-content: space-between;
@include fj;
line-height: 1.45rem;
padding: 0 0.45rem;
span:nth-of-type(1){
......@@ -129,11 +130,12 @@ export default {
font-weight: 900;
@include sc(0.475rem, #9f9f9f);
}
}
.guess_city{
display: flex;
@include fj;
align-items: center;
height: 1.8rem;
justify-content: space-between;
padding: 0 0.45rem;
border-top: 1px solid $bc;
border-bottom: 2px solid $bc;
......@@ -141,8 +143,9 @@ export default {
span:nth-of-type(1){
color: $blue;
}
span:nth-of-type(2){
color: #9f9f9f;
.arrow_right{
@include wh(.6rem, .6rem);
fill: #999;
}
}
}
......
......@@ -27,34 +27,35 @@
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#arrow-left"></use>
</svg>
</footer>
<transition name="fade">
<section class="activities_details" v-if="showActivities">
<h2 class="activities_shoptitle">{{shopDetailData.name}}</h2>
<h3 class="activities_ratingstar">
<rating-star :rating='shopDetailData.rating'></rating-star>
</h3>
<section class="activities_list">
<header class="activities_title_style"><span>优惠信息</span></header>
<ul>
<li v-for="item in shopDetailData.activities" :key="item.id">
<span class="activities_icon" :style="{backgroundColor: '#' + item.icon_color, borderColor: '#' + item.icon_color}">{{item.icon_name}}</span>
<span>{{item.description}}(APP专享)</span>
</li>
</ul>
</section>
<section class="activities_shopinfo">
<header class="activities_title_style"><span>商家公告</span></header>
<p>{{promotionInfo}}</p>
</section>
<svg width="60" height="60" class="close_activities" @click.stop="showActivitiesFun">
<circle cx="30" cy="30" r="25" stroke="#555" stroke-width="1" fill="none"/>
<line x1="22" y1="38" x2="38" y2="22" style="stroke:#999;stroke-width:2"/>
<line x1="22" y1="22" x2="38" y2="38" style="stroke:#999;stroke-width:2"/>
</svg>
</section>
</transition>
</section>
</header>
<transition name="fade">
<section class="activities_details" v-if="showActivities">
<h2 class="activities_shoptitle">{{shopDetailData.name}}</h2>
<h3 class="activities_ratingstar">
<rating-star :rating='shopDetailData.rating'></rating-star>
</h3>
<section class="activities_list">
<header class="activities_title_style"><span>优惠信息</span></header>
<ul>
<li v-for="item in shopDetailData.activities" :key="item.id">
<span class="activities_icon" :style="{backgroundColor: '#' + item.icon_color, borderColor: '#' + item.icon_color}">{{item.icon_name}}</span>
<span>{{item.description}}(APP专享)</span>
</li>
</ul>
</section>
<section class="activities_shopinfo">
<header class="activities_title_style"><span>商家公告</span></header>
<p>{{promotionInfo}}</p>
</section>
<svg width="60" height="60" class="close_activities" @click.stop="showActivitiesFun">
<circle cx="30" cy="30" r="25" stroke="#555" stroke-width="1" fill="none"/>
<line x1="22" y1="38" x2="38" y2="22" style="stroke:#999;stroke-width:2"/>
<line x1="22" y1="22" x2="38" y2="38" style="stroke:#999;stroke-width:2"/>
</svg>
</section>
</transition>
<section class="change_show_type" ref="chooseType">
<div>
<span :class='{activity_show: changeShowType =="food"}' @click="changeShowType='food'">商品</span>
......@@ -513,6 +514,9 @@
this.ratingOffset = 0;
this.ratingTagName = name;
this.ratingList = await getRatingList(this.ratingOffset, name);
if (process.env.NODE_ENV !== 'development') {
this.ratingList = this.ratingList.reverse();
}
},
//页面下拉至底部,加载更多
async loaderMoreRating(){
......@@ -660,14 +664,18 @@
right: .3rem;
}
}
.activities_details{
}
}
.activities_details{
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #262626;
z-index: 21;
z-index: 200;
padding: 1.25rem;
.activities_shoptitle{
text-align: center;
......@@ -720,10 +728,6 @@
}
}
}
}
.food_container{
display: flex;
flex: 1;
......
此差异已折叠。
......@@ -14,144 +14,144 @@ import * as order from './tempdata/order'
* 获取首页默认地址
*/
// export const cityGuess = () => fetch('GET', '/v1/cities', {
// type: 'guess'
// });
export const cityGuess = () => fetch('GET', '/v1/cities', {
type: 'guess'
});
/**
* 获取首页热门城市
*/
// export const hotcity = () => fetch('GET', '/v1/cities', {
// type: 'hot'
// });
export const hotcity = () => fetch('GET', '/v1/cities', {
type: 'hot'
});
/**
* 获取首页所有城市
*/
// export const groupcity = () => fetch('GET', '/v1/cities', {
// type: 'group'
// });
export const groupcity = () => fetch('GET', '/v1/cities', {
type: 'group'
});
/**
* 获取当前所在城市
*/
// export const currentcity = number => fetch('GET', '/v1/cities/' + number, {});
export const currentcity = number => fetch('GET', '/v1/cities/' + number, {});
/**
* 获取搜索地址
*/
// export const searchplace = (cityid, value) => fetch('GET', '/v1/pois', {
// type: 'search',
// city_id: cityid,
// keyword: value
// });
export const searchplace = (cityid, value) => fetch('GET', '/v1/pois', {
type: 'search',
city_id: cityid,
keyword: value
});
/**
* 获取msite页面地址信息
*/
// export const msiteAdress = geohash => fetch('GET', '/v2/pois/' + geohash, {});
export const msiteAdress = geohash => fetch('GET', '/v2/pois/' + geohash, {});
/**
* 获取msite页面食品分类列表
*/
// export const msiteFoodTypes = geohash => fetch('GET', '/v2/index_entry', {
// geohash,
// group_type: '1',
// 'flags[]': 'F'
// });
export const msiteFoodTypes = geohash => fetch('GET', '/v2/index_entry', {
geohash,
group_type: '1',
'flags[]': 'F'
});
/**
* 获取msite商铺列表
*/
// export const shopList = (latitude, longitude, offset, restaurant_category_id = '', restaurant_category_ids = '', order_by = '', delivery_mode = '', support_ids = []) => {
// let supportStr = '';
// support_ids.forEach(item => {
// if (item.status) {
// supportStr += '&support_ids[]=' + item.id;
// }
// });
// let data = {
// latitude,
// longitude,
// offset,
// limit: '20',
// 'extras[]': 'activities',
// keyword: '',
// restaurant_category_id,
// 'restaurant_category_ids[]': restaurant_category_ids,
// order_by,
// 'delivery_mode[]': delivery_mode + supportStr
// };
// return fetch('GET', '/shopping/restaurants', data);
// };
export const shopList = (latitude, longitude, offset, restaurant_category_id = '', restaurant_category_ids = '', order_by = '', delivery_mode = '', support_ids = []) => {
let supportStr = '';
support_ids.forEach(item => {
if (item.status) {
supportStr += '&support_ids[]=' + item.id;
}
});
let data = {
latitude,
longitude,
offset,
limit: '20',
'extras[]': 'activities',
keyword: '',
restaurant_category_id,
'restaurant_category_ids[]': restaurant_category_ids,
order_by,
'delivery_mode[]': delivery_mode + supportStr
};
return fetch('GET', '/shopping/restaurants', data);
};
/**
* 获取search页面搜索结果
*/
// export const searchRestaurant = (geohash, keyword) => fetch('GET', '/v4/restaurants', {
// 'extras[]': 'restaurant_activity',
// geohash,
// keyword,
// type: 'search'
// });
export const searchRestaurant = (geohash, keyword) => fetch('GET', '/v4/restaurants', {
'extras[]': 'restaurant_activity',
geohash,
keyword,
type: 'search'
});
/**
* 获取food页面的 category 种类列表
*/
// export const foodCategory = (latitude, longitude) => fetch('GET', '/shopping/v2/restaurant/category', {
// latitude,
// longitude
// });
export const foodCategory = (latitude, longitude) => fetch('GET', '/shopping/v2/restaurant/category', {
latitude,
longitude
});
/**
* 获取food页面的配送方式
*/
// export const foodDelivery = (latitude, longitude) => fetch('GET', '/shopping/v1/restaurants/delivery_modes', {
// latitude,
// longitude,
// kw: ''
// });
export const foodDelivery = (latitude, longitude) => fetch('GET', '/shopping/v1/restaurants/delivery_modes', {
latitude,
longitude,
kw: ''
});
/**
* 获取food页面的商家属性活动列表
*/
// export const foodActivity = (latitude, longitude) => fetch('GET', '/shopping/v1/restaurants/activity_attributes', {
// latitude,
// longitude,
// kw: ''
// });
export const foodActivity = (latitude, longitude) => fetch('GET', '/shopping/v1/restaurants/activity_attributes', {
latitude,
longitude,
kw: ''
});
/**
* 获取shop页面商铺详情
*/
// export const shopDetails = (shopid, latitude, longitude) => fetch('GET', '/shopping/restaurant/' + shopid, {
// latitude,
// longitude: longitude + '&extras[]=activities&extras[]=album&extras[]=license&extras[]=identification&extras[]=statistics'
// });
export const shopDetails = (shopid, latitude, longitude) => fetch('GET', '/shopping/restaurant/' + shopid, {
latitude,
longitude: longitude + '&extras[]=activities&extras[]=album&extras[]=license&extras[]=identification&extras[]=statistics'
});
......@@ -159,57 +159,57 @@ import * as order from './tempdata/order'
* 获取food页面的商家属性活动列表
*/
// export const foodMenu = restaurant_id => fetch('GET', '/shopping/v2/menu', {
// restaurant_id
// });
export const foodMenu = restaurant_id => fetch('GET', '/shopping/v2/menu', {
restaurant_id
});
/**
* 获取商铺评价列表
*/
// export const getRatingList = (offset, tag_name = '') => fetch('GET', '/ugc/v2/restaurants/834828/ratings', {
// has_content: true,
// offset,
// limit: 10,
// tag_name
// });
export const getRatingList = (offset, tag_name = '') => fetch('GET', '/ugc/v2/restaurants/834828/ratings', {
has_content: true,
offset,
limit: 10,
tag_name
});
/**
* 获取商铺评价分数
*/
// export const ratingScores = shopid => fetch('GET', '/ugc/v2/restaurants/' + shopid + '/ratings/scores', {});
export const ratingScores = shopid => fetch('GET', '/ugc/v2/restaurants/' + shopid + '/ratings/scores', {});
/**
* 获取商铺评价分类
*/
// export const ratingTags = shopid => fetch('GET', '/ugc/v2/restaurants/' + shopid + '/ratings/tags', {});
export const ratingTags = shopid => fetch('GET', '/ugc/v2/restaurants/' + shopid + '/ratings/tags', {});
/**
* 获取短信验证码
*/
// export const mobileCode = phone => fetch('POST', '/v4/mobile/verify_code/send', {
// mobile: phone,
// scene: 'login',
// type: 'sms'
// });
export const mobileCode = phone => fetch('POST', '/v4/mobile/verify_code/send', {
mobile: phone,
scene: 'login',
type: 'sms'
});
/**
* 手机号登陆
*/
// export const sendLogin = (code, mobile, validate_token) => fetch('POST', '/v1/login/app_mobile', {
// code,
// mobile,
// validate_token
// });
export const sendLogin = (code, mobile, validate_token) => fetch('POST', '/v1/login/app_mobile', {
code,
mobile,
validate_token
});
......@@ -217,7 +217,7 @@ import * as order from './tempdata/order'
* 获取用户信息
*/
// export const getUser = () => fetch('GET', '/v1/user', {});
export const getUser = () => fetch('GET', '/v1/user', {});
......@@ -225,175 +225,183 @@ import * as order from './tempdata/order'
* 获取图片验证码
*/
// export const getcaptchas = () => fetch('POST', '/v1/captchas', {});
export const getcaptchas = () => fetch('POST', '/v1/captchas', {});
/**
* 账号密码登陆
*/
//export const accountLogin = (username, password, captcha_code) => fetch('POST', '/v2/login', {username, password, captcha_code});
export const accountLogin = (username, password, captcha_code) => fetch('POST', '/v2/login', {username, password, captcha_code});
/**
* 检测帐号是否存在
*/
// export const checkExsis = (checkNumber, type) => fetch('GET', '/v1/users/exists', {
// [type]: checkNumber,
// type
// });
export const checkExsis = (checkNumber, type) => fetch('GET', '/v1/users/exists', {
[type]: checkNumber,
type
});
/**
* 发送帐号
*/
// export const sendMobile = (sendData, captcha_code, type, password) => fetch('POST', '/v1/mobile/verify_code/send', {
// action: "send",
// captcha_code,
// [type]: sendData,
// type: "sms",
// way: type,
// password,
// });
export const sendMobile = (sendData, captcha_code, type, password) => fetch('POST', '/v1/mobile/verify_code/send', {
action: "send",
captcha_code,
[type]: sendData,
type: "sms",
way: type,
password,
});
/**
* 确认订单
*/
// export const checkout = (geohash, entities) => fetch('POST', '/v1/carts/checkout', {
// come_from: "web",
// geohash,
// entities,
// });
export const checkout = (geohash, entities) => fetch('POST', '/v1/carts/checkout', {
come_from: "web",
geohash,
entities,
});
/**
* 获取快速备注列表
*/
// export const getRemark = (id, sig) => fetch('GET', '/v1/carts/' + id + '/remarks', {
// sig
// });
export const getRemark = (id, sig) => fetch('GET', '/v1/carts/' + id + '/remarks', {
sig
});
/**
* 获取地址列表
*/
// export const getAddress = (id, sig) => fetch('GET', '/v1/carts/' + id + '/addresses', {
// sig
// });
export const getAddress = (id, sig) => fetch('GET', '/v1/carts/' + id + '/addresses', {
sig
});
/**
* 搜索地址
*/
// export const searchNearby = keyword => fetch('GET', '/v1/pois', {
// type: 'nearby',
// keyword
// });
export const searchNearby = keyword => fetch('GET', '/v1/pois', {
type: 'nearby',
keyword
});
/**
* 添加地址
*/
// export const postAddAddress = (userId, address, address_detail, geohash, name, phone, phone_bk, poi_type, sex, tag, tag_type) => fetch('POST', '/v1/users/' + userId + '/addresses', {
// address,
// address_detail,
// geohash,
// name,
// phone,
// phone_bk,
// poi_type,
// sex,
// tag,
// tag_type,
// });
export const postAddAddress = (userId, address, address_detail, geohash, name, phone, phone_bk, poi_type, sex, tag, tag_type) => fetch('POST', '/v1/users/' + userId + '/addresses', {
address,
address_detail,
geohash,
name,
phone,
phone_bk,
poi_type,
sex,
tag,
tag_type,
});
/**
* 下订单
*/
// export const placeOrders = (user_id, cart_id, address_id, description, entities, geohash, sig) => fetch('POST', '/v1/users/' + user_id + '/carts/' + cart_id + '/orders', {
// address_id,
// come_from: "mobile_web",
// deliver_time: "",
// description,
// entities,
// geohash,
// paymethod_id: 1,
// sig,
// });
export const placeOrders = (user_id, cart_id, address_id, description, entities, geohash, sig) => fetch('POST', '/v1/users/' + user_id + '/carts/' + cart_id + '/orders', {
address_id,
come_from: "mobile_web",
deliver_time: "",
description,
entities,
geohash,
paymethod_id: 1,
sig,
});
/**
* 重新发送订单验证码
*/
// export const rePostVerify = (cart_id, sig, type) => fetch('POST', '/v1/carts/' + cart_id + '/verify_code', {
// sig,
// type,
// });
export const rePostVerify = (cart_id, sig, type) => fetch('POST', '/v1/carts/' + cart_id + '/verify_code', {
sig,
type,
});
/**
* 下订单
*/
// export const validateOrders = ({
// user_id,
// cart_id,
// address_id,
// description,
// entities,
// geohash,
// sig,
// validation_code,
// validation_token
// }) => fetch('POST', '/v1/users/' + user_id + '/carts/' + cart_id + '/orders', {
// address_id,
// come_from: "mobile_web",
// deliver_time: "",
// description,
// entities,
// geohash,
// paymethod_id: 1,
// sig,
// validation_code,
// validation_token,
// });
export const validateOrders = ({
user_id,
cart_id,
address_id,
description,
entities,
geohash,
sig,
validation_code,
validation_token
}) => fetch('POST', '/v1/users/' + user_id + '/carts/' + cart_id + '/orders', {
address_id,
come_from: "mobile_web",
deliver_time: "",
description,
entities,
geohash,
paymethod_id: 1,
sig,
validation_code,
validation_token,
});
/**
* 重新发送订单验证码
*/
// export const payRequest = (merchantOrderNo, userId) => fetch('GET', '/payapi/payment/queryOrder', {
// merchantId: 5,
// merchantOrderNo,
// source: 'MOBILE_WAP',
// userId,
// version: '1.0.0',
// });
export const payRequest = (merchantOrderNo, userId) => fetch('GET', '/payapi/payment/queryOrder', {
merchantId: 5,
merchantOrderNo,
source: 'MOBILE_WAP',
userId,
version: '1.0.0',
});
/**
* 获取订单列表
*/
// export const getOrderList = (user_id, offset) => fetch('GET', '/bos/v2/users/' + user_id + '/orders', {
// limit: 10,
// offset,
// });
export const getOrderList = (user_id, offset) => fetch('GET', '/bos/v2/users/' + user_id + '/orders', {
limit: 10,
offset,
});
/**
* 获取订单详情
*/
// export const getOrderDetail = (user_id, orderid) => fetch('GET', '/bos/v1/users/' + user_id + '/orders/' + orderid + '/snapshot', {});
export const getOrderDetail = (user_id, orderid) => fetch('GET', '/bos/v1/users/' + user_id + '/orders/' + orderid + '/snapshot', {});
......@@ -406,48 +414,48 @@ const setpromise = data => {
})
}
export const cityGuess = () => setpromise(home.guesscity);
export const hotcity = () => setpromise(home.hotcity);
export const groupcity = () => setpromise(home.groupcity);
export const currentcity = number => setpromise(city.currentcity);
export const searchplace = (cityid, value) => setpromise(city.searchdata);
export const msiteAdress = geohash => setpromise(msite.msiteAdress);
export const msiteFoodTypes = geohash => setpromise(msite.foodTypes);
export const shopList = (latitude, longitude, offset) => setpromise(msite.shopList);
export const searchRestaurant = (geohash, keyword) => setpromise(search.searchData);
export const foodCategory = (latitude, longitude) => setpromise(food.category);
export const foodDelivery = (latitude, longitude) => setpromise(food.delivery);
export const foodActivity = (latitude, longitude) => setpromise(food.activity);
export const shopDetails = (shopid, latitude, longitude) => setpromise(shop.shopDetails);
export const foodMenu = restaurant_id => setpromise(shop.shopMenu);
export const getRatingList = (offset, tag_name = '') => setpromise(shop.ratingList);
export const ratingScores = shopid => setpromise(shop.scores);
export const ratingTags = shopid => setpromise(shop.tage);
export const mobileCode = phone => setpromise(login.validate_token);
export const sendLogin = (code, mobile, validate_token) => setpromise(login.userInfo);
export const accountLogin = (username, password, captcha_code) => setpromise(login.userInfo);
export const checkExsis = (checkNumber, type) => setpromise(login.checkExsis);
export const sendMobile = (sendData, captcha_code, type, password) => setpromise(login.send);
export const checkout = (geohash, entities) => setpromise(confirm.checkout);
export const getRemark = (id, sig) => setpromise(confirm.remark);
export const getAddress = (id, sig) => setpromise(confirm.addressList);
export const getUser = () => setpromise(login.userInfo);
export const getcaptchas = () => setpromise(login.cpatchs);
export const searchNearby = keyword => setpromise(confirm.searchAddress);
export const postAddAddress = (userId, address, address_detail, geohash, name, phone, phone_bk, poi_type, sex, tag, tag_type) => setpromise(confirm.addAddress);
export const placeOrders = (user_id, cart_id, address_id, description, entities, geohash, sig) => setpromise(confirm.palceOrder);
export const rePostVerify = (cart_id, sig, type) => setpromise(confirm.verfiyCode);
export const validateOrders = ({
user_id,
cart_id,
address_id,
description,
entities,
geohash,
sig,
validation_code,
validation_token
}) => setpromise(confirm.orderSuccess);
export const payRequest = (merchantOrderNo, userId) => setpromise(confirm.payDetail);
export const getOrderList = (user_id, offset) => setpromise(order.orderList);
export const getOrderDetail = (user_id, orderid) => setpromise(order.orderDetail);
// export const cityGuess = () => setpromise(home.guesscity);
// export const hotcity = () => setpromise(home.hotcity);
// export const groupcity = () => setpromise(home.groupcity);
// export const currentcity = number => setpromise(city.currentcity);
// export const searchplace = (cityid, value) => setpromise(city.searchdata);
// export const msiteAdress = geohash => setpromise(msite.msiteAdress);
// export const msiteFoodTypes = geohash => setpromise(msite.foodTypes);
// export const shopList = (latitude, longitude, offset) => setpromise(msite.shopList);
// export const searchRestaurant = (geohash, keyword) => setpromise(search.searchData);
// export const foodCategory = (latitude, longitude) => setpromise(food.category);
// export const foodDelivery = (latitude, longitude) => setpromise(food.delivery);
// export const foodActivity = (latitude, longitude) => setpromise(food.activity);
// export const shopDetails = (shopid, latitude, longitude) => setpromise(shop.shopDetails);
// export const foodMenu = restaurant_id => setpromise(shop.shopMenu);
// export const getRatingList = (offset, tag_name = '') => setpromise(shop.ratingList);
// export const ratingScores = shopid => setpromise(shop.scores);
// export const ratingTags = shopid => setpromise(shop.tage);
// export const mobileCode = phone => setpromise(login.validate_token);
// export const sendLogin = (code, mobile, validate_token) => setpromise(login.userInfo);
// export const accountLogin = (username, password, captcha_code) => setpromise(login.userInfo);
// export const checkExsis = (checkNumber, type) => setpromise(login.checkExsis);
// export const sendMobile = (sendData, captcha_code, type, password) => setpromise(login.send);
// export const checkout = (geohash, entities) => setpromise(confirm.checkout);
// export const getRemark = (id, sig) => setpromise(confirm.remark);
// export const getAddress = (id, sig) => setpromise(confirm.addressList);
// export const getUser = () => setpromise(login.userInfo);
// export const getcaptchas = () => setpromise(login.cpatchs);
// export const searchNearby = keyword => setpromise(confirm.searchAddress);
// export const postAddAddress = (userId, address, address_detail, geohash, name, phone, phone_bk, poi_type, sex, tag, tag_type) => setpromise(confirm.addAddress);
// export const placeOrders = (user_id, cart_id, address_id, description, entities, geohash, sig) => setpromise(confirm.palceOrder);
// export const rePostVerify = (cart_id, sig, type) => setpromise(confirm.verfiyCode);
// export const validateOrders = ({
// user_id,
// cart_id,
// address_id,
// description,
// entities,
// geohash,
// sig,
// validation_code,
// validation_token
// }) => setpromise(confirm.orderSuccess);
// export const payRequest = (merchantOrderNo, userId) => setpromise(confirm.payDetail);
// export const getOrderList = (user_id, offset) => setpromise(order.orderList);
// export const getOrderDetail = (user_id, orderid) => setpromise(order.orderDetail);
......@@ -1588,63 +1588,6 @@ export const addressList = [{
"agent_fee": 0,
"deliver_amount": 0,
"phone_had_bound": true
}, {
"id": 275355683,
"address": "\u4e0a\u6d77\u4eba\u6c11\u5e7f\u573a",
"phone": "13681711254",
"is_valid": 1,
"created_at": "2017-02-20T09:23:14+0800",
"phone_bk": "",
"name": "\u84dd",
"st_geohash": "wtw3sm0q087",
"address_detail": "907\u53f7",
"poi_type": 0,
"sex": 1,
"city_id": 1,
"tag": "\u5bb6",
"is_user_default": false,
"is_deliverable": true,
"agent_fee": 0,
"deliver_amount": 0,
"phone_had_bound": true
}, {
"id": 275304983,
"address": "\u4e0a\u6d77\u4eba\u6c11\u5e7f\u573a",
"phone": "13681711254",
"is_valid": 1,
"created_at": "2017-02-20T09:23:23+0800",
"phone_bk": "",
"name": "\u9ec4",
"st_geohash": "wtw3sm0q087",
"address_detail": "\u4e0a\u6d77\u5e02\u9ec4\u6d66\u533a\u4eba\u6c11\u5927\u9053120\u53f7",
"poi_type": 0,
"sex": 1,
"city_id": 1,
"tag": "\u516c\u53f8",
"is_user_default": false,
"is_deliverable": true,
"agent_fee": 0,
"deliver_amount": 0,
"phone_had_bound": true
}, {
"id": 275190634,
"address": "563\u53f7",
"phone": "13681711254",
"is_valid": 1,
"created_at": "2017-02-20T09:23:31+0800",
"phone_bk": "",
"name": "\u767e",
"st_geohash": "wtw34e4ymr8q",
"address_detail": "\u83b2\u82b1\u8def[\u5730\u94c1\u7ad9] [\u5730\u94c1\u7ad9]",
"poi_type": 0,
"sex": 2,
"city_id": 1,
"tag": "\u516c\u53f8",
"is_user_default": false,
"is_deliverable": true,
"agent_fee": 0,
"deliver_amount": 0,
"phone_had_bound": true
}];
export const palceOrder = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册