From fca8c68aa42fab7a18e456abdbca7c54089126de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Thu, 30 Sep 2021 16:58:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=B2=BE=E5=BA=A6=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E9=A1=B5=E9=9D=A2=E5=92=8C=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/bigc.js | 1 + common/js/zh-address-parse.min.js | 1 - components/birthday/birthday.less | 141 ---- components/birthday/birthday.vue | 106 --- pages.json | 32 - pages/address/add/add.vue | 22 - pages/index/author/author.less | 31 - pages/index/author/author.vue | 190 ----- pages/index/index/index.vue | 336 ++------- pages/order/comment/comment.less | 311 -------- pages/order/comment/comment.vue | 446 ----------- pages/order/confirm/confirm.vue | 15 +- pages/order/evaluate/evaluate.less | 212 ------ pages/order/evaluate/evaluate.vue | 351 --------- pages/order/index/onlineorder.vue | 2 +- pages/order/newdetail/newdetail.vue | 2 +- pages/store/cart/cart.vue | 7 +- pages/store/comment/comment.less | 75 -- pages/store/comment/comment.vue | 163 ---- pages/store/invoiceDetail/invoiceDetail.less | 3 - pages/store/invoiceDetail/invoiceDetail.vue | 196 ----- pages/store/list/list.less | 304 -------- pages/store/list/list.vue | 755 ------------------- pages/user/my/center.vue | 4 +- 24 files changed, 72 insertions(+), 3634 deletions(-) create mode 100644 common/js/bigc.js delete mode 100644 common/js/zh-address-parse.min.js delete mode 100644 components/birthday/birthday.less delete mode 100644 components/birthday/birthday.vue delete mode 100644 pages/index/author/author.less delete mode 100644 pages/index/author/author.vue delete mode 100644 pages/order/comment/comment.less delete mode 100644 pages/order/comment/comment.vue delete mode 100644 pages/order/evaluate/evaluate.less delete mode 100644 pages/order/evaluate/evaluate.vue delete mode 100644 pages/store/comment/comment.less delete mode 100644 pages/store/comment/comment.vue delete mode 100644 pages/store/invoiceDetail/invoiceDetail.less delete mode 100644 pages/store/invoiceDetail/invoiceDetail.vue delete mode 100644 pages/store/list/list.less delete mode 100644 pages/store/list/list.vue diff --git a/common/js/bigc.js b/common/js/bigc.js new file mode 100644 index 0000000..11660e7 --- /dev/null +++ b/common/js/bigc.js @@ -0,0 +1 @@ +!function(e){"use strict";var r,i=20,s=1,P=1e6,o=-7,f=21,c="[big.js] ",u=c+"Invalid ",b=u+"decimal places",h=u+"rounding mode",x=c+"Division by zero",l={},D=void 0,a=/^-?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?$/i;function R(e,r,t,n){var i=e.c,s=e.e+r+1;if(s++n&&R(e,t,o.RM),2==r&&(n=e.e+t+1);e.c.length=o.PE))s=s.charAt(0)+(1t)for(i-=t;i--;)s+="0";else ii[s]^r?1:-1;return f==c?0:cw[l]?1:-1;break}if(!(h<0))break;for(c=d==f?i:a;d;){if(w[--d]>=1;)r=r.times(r);return i?t.div(n):n},l.round=function(e,r){var t=this.constructor;if(e===D)e=0;else if(e!==~~e||e<-P||P=0||(o[c]=e[c]);return o}(e,n);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(e);for(d=0;d=0||Object.prototype.propertyIsEnumerable.call(e,c)&&(o[c]=e[c])}return o}var t=o.reduce((function(e,n){n.children;var c=h(n,["children"]);return e.concat(c)}),[]),u=o.reduce((function(e,n){return e.concat(n.children?n.children.map((function(e){e.children;return i({},h(e,["children"]),{provinceCode:n.code})})):[])}),[]),f=o.reduce((function(e,n){var c=n.code;return e.concat(n.children?n.children.reduce((function(e,n){var d=n.code;return e.concat(n.children?n.children.map((function(e){e.children;return i({},h(e,["children"]),{cityCode:d,provinceCode:c})})):[])}),[]):[])}),[]),p=JSON.stringify(t),s=JSON.stringify(u),g=JSON.stringify(f);console.log(t.length+u.length+f.length);var v=function(e,n){var c=n.province||[],d=n.city||[],o=n.area||[],a=[],m="";if(0===c.length){for(var r=1;r0&&a.push(e),{province:c,city:d,area:o,detail:a}},y=function(e,n){var c=[],d=[],o=[],a=[];if(n.province[0])c=n.province;else{var m=!0,r=!1,i=void 0;try{for(var l,h=t[Symbol.iterator]();!(m=(l=h.next()).done);m=!0){for(var p=l.value,s=p.name,g="",v=s.length;v>1;v--){var y=s.substring(0,v);if(0===e.indexOf(y)){g=y;break}}if(g){c.push(p),e=e.replace(new RegExp(g,"g"),"");break}}}catch(e){r=!0,i=e}finally{try{m||null==h.return||h.return()}finally{if(r)throw i}}}if(n.city[0])d=n.city;else{var b=!0,O=!1,x=void 0;try{for(var j,S=function(){var n=j.value,o=n.name,a=n.provinceCode,m=c[0];if(m){if(m.code===a){for(var r="",i=o.length;i>1;i--){var l=o.substring(0,i);if(0===e.indexOf(l)){r=l;break}}if(r)return d.push(n),e=e.replace(new RegExp(r,"g"),""),"break"}}else{for(var h=o.length;h>1;h--){var u=o.substring(0,h);if(0===e.indexOf(u)){d.push(n),c.push(t.find((function(e){return e.code===a}))),e=e.replace(u,"");break}}if(d.length>0)return"break"}},w=u[Symbol.iterator]();!(b=(j=w.next()).done);b=!0){if("break"===S())break}}catch(e){O=!0,x=e}finally{try{b||null==w.return||w.return()}finally{if(O)throw x}}}var E=!0,k=!1,P=void 0;try{for(var C,J=function(){var n=C.value,a=n.name,m=n.provinceCode,r=n.cityCode,i=c[0],l=d[0];if(i||l){if(i&&i.code===m||(l&&l.code)===r){for(var h="",f=a.length;f>1;f--){var p=a.substring(0,f);if(0===e.indexOf(p)){h=p;break}}if(h)return o.push(n),!l&&d.push(u.find((function(e){return e.code===r}))),!i&&c.push(t.find((function(e){return e.code===m}))),e=e.replace(h,""),"break"}}else{for(var s=a.length;s>1;s--){var g=a.substring(0,s);if(0===e.indexOf(g)){o.push(n),d.push(u.find((function(e){return e.code===r}))),c.push(t.find((function(e){return e.code===m}))),e=e.replace(g,"");break}}if(o.length>0)return"break"}},N=f[Symbol.iterator]();!(E=(C=N.next()).done);E=!0){if("break"===J())break}}catch(e){k=!0,P=e}finally{try{E||null==N.return||N.return()}finally{if(k)throw P}}return e.length>0&&a.push(e),{province:c,city:d,area:o,detail:a}},b=function(e,n){if(!e||!/[\u4E00-\u9FA5]/.test(e))return"";if(["先生","小姐","同志","哥哥","姐姐","妹妹","弟弟","妈妈","爸爸","爷爷","奶奶","姑姑","舅舅"].find((function(n){return-1!==e.indexOf(n)})))return e;var c=e.substring(0,1);return e.length<=n&&e.length>1&&-1!==d.indexOf(c)?e:""},O=function(e){var n="";e=(e=(e=(e=e.replace(/(\d{3})-(\d{4})-(\d{4})/g,"$1$2$3")).replace(/(\d{3}) (\d{4}) (\d{4})/g,"$1$2$3")).replace(/(\d{4}) \d{4} \d{4}/g,"$1$2$3")).replace(/(\d{4})/g,"$1");var c=/(\d{7,12})|(\d{3,4}-\d{6,8})|(86-[1][0-9]{10})|(86[1][0-9]{10})|([1][0-9]{10})/g.exec(e);return c&&(n=c[0],e=e.replace(c[0]," ")),{address:e,phone:n}},x=function(e){var n="",c=/\d{6}/g.exec(e);return c&&(n=c[0],e=e.replace(c[0]," ")),{address:e,postalCode:n}},j=function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[];e=e.replace(/\r\n/g," ").replace(/\n/g," ").replace(/\t/g," ");var c=["详细地址","收货地址","收件地址","地址","所在地区","地区","姓名","收货人","收件人","联系人","收","邮编","联系电话","电话","联系人手机号码","手机号码","手机号"].concat(n);c.forEach((function(n){e=e.replace(new RegExp(n,"g")," ")}));var d=new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“’。，、？]","g");return e=(e=e.replace(d," ")).replace(/ {2,}/g," ")};n.default=function(e,n){var c="object"===m(n)?n:"number"==typeof n?{type:n}:{},d=c.type,o=void 0===d?0:d,r=c.textFilter,i=void 0===r?[]:r,l=c.nameMaxLength,h=void 0===l?4:l;if(!e)return{};var t={phone:"",province:[],city:[],area:[],detail:[],name:""};e=j(e,i);var u=O(e);e=u.address,t.phone=u.phone;var f=x(e);e=f.address,t.postalCode=f.postalCode;var p=e.split(" ").filter((function(e){return e})).map((function(e){return e.trim()}));(new Date).getTime();p.forEach((function(e,n){if(t.province[0]&&t.city[0]&&t.area[0])t.detail.push(e);else{var c={};1===o&&(c=y(e,t)),0===o&&(c=v(e,t));var d=c,a=d.province,m=d.city,r=d.area,i=d.detail;t.province=a||[],t.area=r||[],t.city=m||[],t.detail=t.detail.concat(i||[])}})),console.log("---\x3e",p);(new Date).getTime();var s=t.province[0],g=t.city[0],S=t.area[0],w=t.detail;if(w&&w.length>0){var E=a(w);E.sort((function(e,n){return e.length-n.length}));var k=E.findIndex((function(e){return b(e,h)})),P="";-1!==k?P=E[k]:E[0].length<=h&&/[\u4E00-\u9FA5]/.test(E[0])&&(P=E[0]),P&&(t.name=P,w.splice(w.findIndex((function(e){return e===P})),1))}return JSON.stringify(t),Object.assign(t,{province:s&&s.name||"",city:g&&g.name||"",area:S&&S.name||"",detail:w&&w.length>0&&w.join("")||""})}}]).default})); \ No newline at end of file diff --git a/components/birthday/birthday.less b/components/birthday/birthday.less deleted file mode 100644 index 701438f..0000000 --- a/components/birthday/birthday.less +++ /dev/null @@ -1,141 +0,0 @@ - .birthday-box{ - .mask{ - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 200; - overflow-y: hidden; - background-color: rgba(0, 0, 0, 0.4); - } - .box{ - position: fixed; - z-index: 500; - width: 80%; - top: 47%; - left: 50%; - transform: translate(-50%, -50%); - overflow: auto; - height: 70%; - .title{ - position: relative; - height: 45%; - background: url("http://ibrand-miniprogram.oss-cn-hangzhou.aliyuncs.com/18-12-27/10678114.jpg") no-repeat; - background-size: 100% 100%; - image{ - position: absolute; - right: 0; - top: 2px; - color: #fff; - width: 30px; - height: 30px; - } - i{ - position: absolute; - right: 0; - top: -5px; - color: #fff; - font-size: 30px; - } - } - .name{ - font-size: 14px; - text-align: center; - margin-right: 2px; - color: #FFFFFF; - background: #ffce2f; - span{ - color: #e7636f; - } - } - .coupon-list{ - overflow: auto; - height: 37%; - background: #ffce2f; - /*margin: 0 9px 0 10px;*/ - margin-right: 2px; - padding: 0 15px; - .item{ - display: flex; - align-items: center; - justify-content: space-between; - position: relative; - padding: 5px 10px; - margin-bottom: 10px; - background: #FFFFFF; - border-radius: 4px; - - &:first-child{ - margin-top: 10px; - } - &::before { - position: absolute; - left: -5px; - top: 20px; - content: ''; - background: #ffce2f; - width: 10px; - height: 10px; - border-radius: 100%; - } - &::after { - position: absolute; - right: -5px; - top: 20px; - content: ''; - background: #ffce2f; - width: 10px; - height: 10px; - border-radius: 100%; - } - - .left{ - flex: 1; - font-size: 14px; - margin-right: 10px; - overflow: hidden; - div{ - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - - } - .time{ - font-size: 10px; - color: #9B9B9B; - min-height: 19px; - } - } - .right{ - - font-size: 16px; - color: #e7636f; - } - &.point{ - padding: 13px 10px; - } - } - } - - .buttom{ - font-size: 14px; - padding: 14px; - /*height: 10%;*/ - text-align: center; - color: #FFFFFF; - background: #ffce2f; - border-top: 4px solid #f7a63d; - border-radius: 0 0 5px 5px; - margin-right: 2px; - span{ - background: #e7636f; - border-radius: 20px; - padding: 10px 50px; - - } - } - } - - } - diff --git a/components/birthday/birthday.vue b/components/birthday/birthday.vue deleted file mode 100644 index f920310..0000000 --- a/components/birthday/birthday.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - - - diff --git a/pages.json b/pages.json index e55cf6f..b0e2f29 100644 --- a/pages.json +++ b/pages.json @@ -54,20 +54,6 @@ "navigationBarTitleText":"优惠券" } }, - { - "path": "pages/store/list/list", - "style": { - "navigationBarTitleText": "商品列表", - "navigationStyle":"custom" - } - }, - { - "path": "pages/store/comment/comment", - "style": { - "navigationBarTitleText": "商品评论" , - "navigationStyle":"custom" - } - }, { "path": "pages/store/cart/cart", "style": { @@ -166,12 +152,6 @@ "navigationStyle": "custom" } }, - { - "path": "pages/index/author/author", - "style": { - "navigationBarTitleText": "iBrand社交新零售" - } - }, { "path": "pages/user/register/register", "style": { @@ -204,18 +184,6 @@ }, { "path": "pages/address/list/list", "style": { "navigationBarTitleText": "收货地址列表", "navigationStyle":"custom" } }, - { - "path": "pages/order/evaluate/evaluate", - "style": { - "navigationBarTitleText": "评价" - } - }, - { - "path": "pages/order/comment/comment", - "style": { - "navigationBarTitleText": "评价" - } - }, { "path": "pages/recharge/balance/balance", "style": { diff --git a/pages/address/add/add.vue b/pages/address/add/add.vue index a94b526..ee78734 100644 --- a/pages/address/add/add.vue +++ b/pages/address/add/add.vue @@ -111,17 +111,6 @@ - \ No newline at end of file diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue index fc71f0b..147ed2f 100644 --- a/pages/index/index/index.vue +++ b/pages/index/index/index.vue @@ -21,292 +21,55 @@ - - - - - - - 今日头条 - - {{ item.title }} - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ item.title }} - - - - - {{ item.title }} - - - - + + + + + + + 今日头条 + + {{ item.title }} + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.title }} + + + + + {{ item.title }} + + + + - - - - - - - - - - - - - - - - - - - - - - - {{noLoginGift.title}} - -
- 数量有限，先到先得 -
- - - - - - - - - - - 赠送积分 - - - - {{noLoginGift.point}} - - - - - - - - {{item.coupon.title}} - - - {{item.coupon.usestart_at}} - {{item.coupon.useend_at}} - - - - {{item.coupon.label}} - - - - - - 我知道了 - - - - - - - - - - - - - - - - - 仅限新人领取 - - - 你可是老朋友哦 - - - - - - - - 抢光了 - - - 祝你下次好运，加油哦 - - - - - - - - - 领取成功 - - - - 已放入你的账户 {{loginGift.user.mobile}} - - - - - - - - - - - - - - - - - - - - 赠送 {{loginGift.activity.point}} 积分 - - - - - - - - - - -
-
- - {{item.coupon.title}} -
- - - {{item.coupon.usestart_at}} - {{item.coupon.useend_at}} - -
-
- - {{item.coupon.label}} -
- - - - - - - - - - - - - 赠送 {{loginGift.activity.point}} 积分 - - - - - - - - - - - - - - {{item.coupon.title}} - -
- - {{item.coupon.usestart_at}} - {{item.coupon.useend_at}} -
- -
- - {{item.coupon.label}} -
- - - - - - - - - - - - - - 赠送 {{loginGift.activity.point}} 积分 - - - - - - - - - - - - - - {{item.coupon.title}} - - - - - {{item.coupon.usestart_at}} - {{item.coupon.useend_at}} - - - - - {{item.coupon.label}} - - - - - - 我知道了 - - - @@ -321,7 +84,7 @@ 99+ - + @@ -334,7 +97,6 @@ import {pageLogin, getUrl,config,isBirthday,autoLogin} from '@/common/js/utils.js'; import indexBanner from '@/components/index-banner/index-banner'; import indexNav from "@/components/index-nav/index-nav"; - import birthday from '@/components/birthday/birthday.vue'; import lfNav from '@/components/lf-nav/lf-nav.vue'; import lfTabbar from '@/components/lf-tabbar/lf-tabbar.vue'; import lfAdModal from '@/components/lf-adModal/lf-adModal.vue'; @@ -345,6 +107,7 @@ import lfMultiColumnAd from '@/components/lf-multiColumnAd/lf-multiColumnAd.vue'; import lfSeckill from '@/components/lf-seckill/lf-seckill.vue'; var app = getApp(); + export default { data() { return { @@ -393,7 +156,6 @@ components: { indexBanner, indexNav, - birthday, lfNav, lfTabbar, lfAdModal, @@ -447,7 +209,7 @@ // 生命周期 onLoad(e) { - // 进入开屏广告页 todo 暂时注释，已对接完成 + // 进入开屏广告页 // if(app.globalData.app_first_full){ // getApp().globalData.app_first_full = false; // this.$url('/pages/index/openScreenAd/openScreenAd', {type: 'launch'}); diff --git a/pages/order/comment/comment.less b/pages/order/comment/comment.less deleted file mode 100644 index 5688016..0000000 --- a/pages/order/comment/comment.less +++ /dev/null @@ -1,311 +0,0 @@ -@import '../../../common/css/global'; -#order-index { - - .navbar { - position: fixed; - top: 0px; - width: 100%; - display: flex; - z-index: 20; - height: 50px; - line-height: 50px; - background: #FFFFFF; - font-size: 14px; - color: #353535; - - .navbar-item { - flex: 1; - width: 0%; - text-align: center; - - &.activity { - color: @globalColor; - } - } - .navbar-slider { - position: absolute; - content: " "; - left: 0; - bottom: 0; - width: 4em; - height: 3px; - background-color: @globalColor; - -webkit-transition: -webkit-transform .3s; - transition: -webkit-transform .3s; - transition: transform .3s; - transition: transform .3s, -webkit-transform .3s - } - } - .tab-panel{ - padding-top: 50px; - } - .order-box { - .order-item__none{ - text-align: center; - color: #959595; - padding-top: 10px; - } - .order-item { - margin-top: 10px; - background: #FFFFFF; - font-size: 15px; - - .item-top { - .indent { - line-height: 35px; - display: flex; - align-items: center; - justify-content: space-between; - padding: 0 10px; - - .order-num { - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - flex: 1; - padding-right: 10px; - color: #4A4A4A; - font-size: 12px; - line-height: 17px; - - /*span { - font-weight: bold; - }*/ - } - .order-type { - color: @globalColor; - } - } - } - .item-middle { - .middle-item { - display: flex; - padding: 15px; - color: #959595; - - image { - width: 60px; - height: 60px; - border: 1px solid #e5e5e5; - } - .commodity_detail{ - flex: 1; - overflow: hidden; - padding-left: 13px; - .detail_name{ - - color: #000; - font-size: 14px; - line-height: 20px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - .detail_num{ - display: flex; - justify-content: space-between; - align-items: center; - .num_css{ - span{ - font-size: 12px; - line-height: 16px; - padding-right: 4px; - color: #9B9B9B; - } - } - .num_money{ - font-size: 12px; - line-height: 16px; - color: #9B9B9B; - } - } - } - - } - } - .closeTime{ - padding: 10px; - font-size: 12px; - color: @globalColor; - - .iconfont{ - margin-right: 5px; - } - } - .item-bottom { - display: flex; - align-items: center; - justify-content: space-between; - padding: 10px; - .all-money{ - color: #4a4a4a; - font-size: 12px; - line-height: 17px; - } - .button-box { - font-size: 13px; - color: @globalColor; - padding: 5px 10px; - border: 1px solid @globalColor; - border-radius: 3px; - } - } - } - .evaluate-item { - margin-top: 10px; - background: #FFFFFF; - .adapter{ - padding: 12px 15px 18px 15px; - - .adapter_item{ - display: flex; - align-items: center; - justify-content: space-between; - .item_title{ - display: flex; - align-items: center; - .adapter-img{ - position: relative; - width: 34px; - height: 34px; - display: inline-block; - overflow: visible; - border-radius: 100%; - border: 1px solid #825139; - image{ - display: inline-block; - width: 32px; - height: 32px; - border-radius: 50%; - } - .justify{ - font-size: 10px; - position: absolute; - width: 14px; - height: 14px; - text-align: center; - content:""; - right: 0; - bottom: 0; - border-radius: 100%; - background-color: #825139; - color: #ffffff; - } - } - .text{ - color: #717071; - font-size: 12px; - line-height: 14px; - padding-left: 12px; - } - } - .rater { - .vlc-rater { - display: flex; - } - } - } - .adapter_type{ - padding-bottom: 6px; - span{ - color: #9B9B9B; - font-size: 10px; - line-height: 14px; - padding-right: 20px; - } - } - .adapter_content{ - color: #000; - font-size: 14px; - line-height: 20px; - .content_text{ - color: #000; - font-size: 14px; - line-height: 20px; - padding-bottom: 3px; - } - .content_img{ - //width: 25%; - width: 100%; - box-sizing: border-box; - .img_item{ - width: 25%; - text-align: center; - display: inline-block; - padding: 3px; - box-sizing: border-box; - view { - height: 0; - padding-bottom: 100%; - position: relative; - } - .img{ - overflow: hidden; - image { - width: 100%; - height: 100%; - position: absolute; - left: 0; - top: 0; - } - } - } - } - } - } - .commodity{ - padding: 15px 12px 11px 12px; - .commodity_item{ - background: #f3f3f3; - padding: 5px; - display: flex; - .commodity_img{ - width: 60px; - height: 60px; - image{ - width: 100%; - height: 100%; - } - } - .commodity_detail{ - flex: 1; - overflow: hidden; - padding-left: 13px; - .detail_name{ - - color: #000; - font-size: 14px; - line-height: 20px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - .detail_num{ - display: flex; - justify-content: space-between; - align-items: center; - .num_css{ - span{ - font-size: 12px; - line-height: 16px; - padding-right: 4px; - color: #9B9B9B; - } - } - .num_money{ - font-size: 12px; - line-height: 16px; - color: #9B9B9B; - } - } - } - } - } - } - .loadingbox{ - height: 40px; - line-height: 40px; - text-align: center; - } - } -} \ No newline at end of file diff --git a/pages/order/comment/comment.vue b/pages/order/comment/comment.vue deleted file mode 100644 index badb5e8..0000000 --- a/pages/order/comment/comment.vue +++ /dev/null @@ -1,446 +0,0 @@ - - - - \ No newline at end of file diff --git a/pages/order/confirm/confirm.vue b/pages/order/confirm/confirm.vue index 1790899..1a912bc 100644 --- a/pages/order/confirm/confirm.vue +++ b/pages/order/confirm/confirm.vue @@ -93,7 +93,8 @@ 共{{ order_detail.order.count }}件 - 合计 ¥{{ order_detail.order.total_yuan }} + + 合计 ¥{{ totalPrice }} 提交订单 @@ -153,6 +154,7 @@ - \ No newline at end of file diff --git a/pages/order/index/onlineorder.vue b/pages/order/index/onlineorder.vue index 86a5de8..2658166 100644 --- a/pages/order/index/onlineorder.vue +++ b/pages/order/index/onlineorder.vue @@ -25,7 +25,7 @@ - {{item2.from}} + {{item2.brand.name}} diff --git a/pages/order/newdetail/newdetail.vue b/pages/order/newdetail/newdetail.vue index 36c6b18..52bdee2 100644 --- a/pages/order/newdetail/newdetail.vue +++ b/pages/order/newdetail/newdetail.vue @@ -49,7 +49,7 @@ - {{order_details.from}} + {{order_details.brand.name}} diff --git a/pages/store/cart/cart.vue b/pages/store/cart/cart.vue index d29e695..cd74a47 100644 --- a/pages/store/cart/cart.vue +++ b/pages/store/cart/cart.vue @@ -60,6 +60,7 @@ - \ No newline at end of file diff --git a/pages/store/invoiceDetail/invoiceDetail.less b/pages/store/invoiceDetail/invoiceDetail.less deleted file mode 100644 index 27bf477..0000000 --- a/pages/store/invoiceDetail/invoiceDetail.less +++ /dev/null @@ -1,3 +0,0 @@ -.invoice_detail{ - -} \ No newline at end of file diff --git a/pages/store/invoiceDetail/invoiceDetail.vue b/pages/store/invoiceDetail/invoiceDetail.vue deleted file mode 100644 index bedb434..0000000 --- a/pages/store/invoiceDetail/invoiceDetail.vue +++ /dev/null @@ -1,196 +0,0 @@ - - - - - diff --git a/pages/store/list/list.less b/pages/store/list/list.less deleted file mode 100644 index 3f1ad5c..0000000 --- a/pages/store/list/list.less +++ /dev/null @@ -1,304 +0,0 @@ -#store-list{ - .commodity-top{ - position: fixed; - top: 0; - width: 100%; - z-index: 10; - .sidebar{ - background: #FFFFFF; - font-size: 18px; - width: 100%; - height: 50px; - display: flex; - align-items: center; - - .sidebar-left{ - flex: 1; - height: 100%; - - span{ - display: inline-block; - line-height: 50px; - height: 100%; - padding-left: 15px; - } - } - .sidebar-right{ - width: 120px; - height: 100%; - overflow: hidden; - - view{ - display: inline-block; - width: 40px; - height: 100%; - text-align: center; - line-height: 50px; - font-size: 20px; - } - } - } - .filter-box{ - display: flex; - justify-content: space-between; - align-items: center; - font-size: 14px; - background: #FFFFFF; - - .filter-item{ - display: flex; - flex: 1; - width: 0%; - justify-content: center; - align-items: center; - line-height: 40px; - height: 40px; - - .left{ - flex: 1; - margin-left: 20px; - text-align: center; - - &.active { - color: #099FFF; - } - - } - &.dis { - color: #eeeeee; - } - .right{ - width: 20px; - height: 100%; - margin-right: 5px; - background: url("https://ibrand-miniprogram.oss-cn-hangzhou.aliyuncs.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/ico-filter.png") no-repeat center; - background-size: 8px 12px; - - &.asc { - background-image: url("https://ibrand-miniprogram.oss-cn-hangzhou.aliyuncs.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/ico-filter1.png"); - transform: rotate(180deg); - } - &.desc { - background-image: url("https://ibrand-miniprogram.oss-cn-hangzhou.aliyuncs.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/ico-filter1.png"); - } - } - } - } - } - .commodity-bottom{ - //height: 100%; - font-size: 0; - box-sizing: border-box; - padding: 90px 5px 20px 5px; - .commodity-out{ - width: 50%; - display: inline-block; - font-size: 12px; - padding: 10px 5px 0 5px; - box-sizing: border-box; - .commodity-box{ - background: #ffffff; - overflow: hidden; - width: 100%; - padding: 10px; - box-sizing: border-box; - font-size: 14px; - - .commodity-img { - overflow: hidden; - text-align: center; - image{ - width: 290rpx; - //height: 310rpx; - } - } - .commodity-name{ - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - .commodity-money{ - display: flex; - align-items: center; - margin-top: 10px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - height: 25px; - .money{ - color: #ED3327; - margin-top: 2px; - .origin-money{ - color: #AAAAAA; - font-size: 12px; - display: inline-block; - padding-left:2px; - text-decoration: line-through; - } - - } - .discount-tags{ - font-size: 0; - overflow: hidden; - - .tags-item{ - display: block; - float: left; - color: #ffffff; - background: #EB7073; - border-radius: 2px; - padding: 2px 5px; - font-size: 12px; - margin: 0 0 0px 5px; - - } - } - .vip-type { - width: 15px; - height: 15px; - margin-left: 5px; - image { - width: 100%; - height: 100%; - } - } - } - } - } - .commodity-out-vertical{ - display: flex; - align-items: center; - padding-right:5px; - background-color: #FFFFFF; - margin-top: 10px; - .img-box{ - width:110px; - margin-right: 10px; - image{ - vertical-align: middle; - width: 100%; - } - } - .right-box{ - flex: 1; - overflow: hidden; - .goods-name{ - color: #111111; - font-size: 14px; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp:2; - -webkit-box-orient: vertical; - padding-top: 10px; - } - .goods-money{ - color:#FB5054; - font-size: 14px; - padding:26px 0px 13px 0; - .origin-money{ - color: #AAAAAA; - font-size: 12px; - display: inline-block; - padding-left:2px; - text-decoration: line-through; - } - } - - - } - } - .loadingbox{ - margin-top: 10px; - height: 40px; - line-height: 40px; - text-align: center; - font-size:14px; - } - } -} - -.right-filter-box{ - overflow: auto; - position: fixed; - top: 0; - bottom: 0; - width: 100%; - padding: 6px; - background: #FFFFFF; - font-size: 14px; - //overflow: hidden; - z-index: 10; - //transform: translateX(100%); - .box{ - height: 100%; - .title{ - padding: 10px 5px; - } - .list{ - font-size: 0; - .list-block{ - display: inline-block; - width: 33.33%; - font-size: 12px; - margin-bottom: 10px; - padding: 0 5px; - - .selected{ - background-color: #fff; - border-color: #f9be00; - } - - view{ - display: block; - height: 34px; - line-height: 30px; - text-align: center; - background: #ededed; - width: 100%; - border: 2px solid #ededed; - box-sizing: border-box; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - } - .price-inputs{ - padding: 0 5px; - display: flex; - - input{ - display: block; - text-align: center; - width: 31%; - height: 35px; - outline: none; - background: #f8f8f8; - } - .minus{ - font-size: 12px; - height: 35px; - line-height: 35px; - text-align: center; - padding: 0 5px; - } - } - } - .button-box{ - display: flex; - align-items: center; - justify-content: space-between; - font-size: 12px; - margin: 15px 0; - - button{ - width: 0%; - height: 40px; - line-height: 40px; - text-align: center; - flex: 1; - margin: 0 8px; - } - } - } -} \ No newline at end of file diff --git a/pages/store/list/list.vue b/pages/store/list/list.vue deleted file mode 100644 index 628b6e8..0000000 --- a/pages/store/list/list.vue +++ /dev/null @@ -1,755 +0,0 @@ - - - \ No newline at end of file diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue index 7cf518f..f11c0ab 100644 --- a/pages/user/my/center.vue +++ b/pages/user/my/center.vue @@ -44,10 +44,10 @@ VIP {{ centerInfo.userLevel.name }} - 卡号: 666666 + - 会员权益 + 会员服务