From 98bc06e3004188e50c01cdec98f6adbd5d16050e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=92=BB=E9=A3=8E?= <1090115880@qq.com> Date: Tue, 26 Jan 2021 13:52:51 +0800 Subject: [PATCH] Gray1.0 --- pages.json | 32 ++- pages/apply/apply.vue | 200 ++++++++++++++++++ pages/apply/success.vue | 92 ++++++++ pages/goodsDetail/goodsDetail.vue | 334 ++++++++++++++++-------------- pages/index/index.vue | 8 +- pages/invite/invite.vue | 82 ++++++++ pages/shop/shop.vue | 8 +- static/wx.png | Bin 0 -> 1786 bytes utils/http.interceptor.js | 2 +- 9 files changed, 594 insertions(+), 164 deletions(-) create mode 100644 pages/apply/apply.vue create mode 100644 pages/apply/success.vue create mode 100644 pages/invite/invite.vue create mode 100644 static/wx.png diff --git a/pages.json b/pages.json index 4ebace2..cdc824f 100644 --- a/pages.json +++ b/pages.json @@ -3,6 +3,7 @@ "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" }, "pages": [ + { "path": "pages/index/index", "style": { @@ -90,6 +91,7 @@ "enablePullDownRefresh": false } }, + { "path": "pages/shop/shop", "style": { @@ -355,8 +357,8 @@ { "path": "pages/webview/webview", "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, + // "navigationBarTitleText": "", + // "enablePullDownRefresh": false, "navigationStyle": "custom" } }, @@ -474,8 +476,28 @@ "enablePullDownRefresh": false } - } - ,{ + }, + { + "path": "pages/apply/apply", + "style": { + "navigationBarTitleText": "填写资料" + } + }, + { + "path": "pages/apply/success", + "style": { + "navigationBarTitleText": "提交成功" + } + }, + { + "path": "pages/invite/invite", + "style": { + "navigationBarTitleText": "推荐升级", + "enablePullDownRefresh": false + // "navigationStyle": "custom" + } + }, + { "path" : "pages/shopOrders/shopOrders", "style" : { @@ -505,6 +527,7 @@ "navigationStyle": "custom" } }, + { "path": "goodsCart/index", "style": { @@ -518,6 +541,7 @@ "navigationStyle": "custom" } }, + { "path": "agreement/goods", "style": { diff --git a/pages/apply/apply.vue b/pages/apply/apply.vue new file mode 100644 index 0000000..1209648 --- /dev/null +++ b/pages/apply/apply.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/pages/apply/success.vue b/pages/apply/success.vue new file mode 100644 index 0000000..32ac9e0 --- /dev/null +++ b/pages/apply/success.vue @@ -0,0 +1,92 @@ + + + + + + diff --git a/pages/goodsDetail/goodsDetail.vue b/pages/goodsDetail/goodsDetail.vue index 7c50545..c10c8fa 100644 --- a/pages/goodsDetail/goodsDetail.vue +++ b/pages/goodsDetail/goodsDetail.vue @@ -8,7 +8,7 @@ - @@ -79,57 +79,79 @@ 售后无忧 + + + + 领券 + 暂无优惠券 + + + 规格 + {{checkedSku}} + + + + + + 进口税 + + 包税 预计￥{{goodsDetail.price.max.ferme}}由瑞库客 + + - - - 领券 - 暂无优惠券 - - - 规格 - {{checkedSku}} - - - - - - 进口税 - - 包税 预计￥{{goodsDetail.price.max.ferme}}由瑞库客 - - - - - - 送至 - 请选择 收货地址 - - - + + + 送至 + + + 请选择收货地址 + {{address}} + + + + + + + + + + + 正品保障 + + + + + + + 国内仓 - - + + + + 海外直邮 + + + + 保税仓 + + + - - 宁波市 - - - - --> + + + {{addressList[addressList.length-1]}} + + + + + + + + @@ -139,30 +161,30 @@ 服务 - - - - - 不支持7天无理由退换货 - - - - - 跨境商品不支持开发票 - - - 不支持7天无理由退换货 - - - - - 正品保证 | 售后无忧 - - + + + + + 不支持7天无理由退换货 + + + + + 跨境商品不支持开发票 + + + 不支持7天无理由退换货 + + + + + 正品保证 | 售后无忧 + + - + 用户评价({{goodsDetail.evaluations.total}}) @@ -242,7 +264,7 @@ - + 购物车 @@ -338,34 +360,35 @@ 完成 - + - 产品参数 - - - - 品牌 - - - {{goodsDetail.brand.name}} - - - - - 条形码 - - - {{item.name}} {{item.code}} - - - - - - 完成 + 产品参数 + + + + 品牌 + + + {{goodsDetail.brand.name}} + + + + + 条形码 + + + {{item.name}} + {{item.code}} + + + + + + 完成 - + - + @@ -415,8 +438,8 @@ import dynamics from 'components/dynamics.vue' export default { data() { - return { - parameterShow:false, + return { + parameterShow: false, swiperImgList: [], roleLevel: 500, STATIC_URL: this.STATIC_URL, @@ -440,6 +463,8 @@ containerIndex: 0, dynamics: [], //动态列表, showBtn: false, //是否显示发布按钮 + addressList: [], + address: null } }, components: { @@ -459,8 +484,8 @@ if (uni.getStorageSync("auth")) { this.showBtn = true } - this.id = parseInt(options.id) - console.log(this.id+'-------') + this.id = parseInt(options.id) + console.log(this.id + '-------') this.getGoodsDetail() }, computed: { @@ -475,9 +500,9 @@ mounted() { console.log(uni.getStorageSync("userInfo").id) }, - methods: { - parameterModel(bool){ - this.parameterShow = bool + methods: { + parameterModel(bool) { + this.parameterShow = bool }, getUrlKey(url, name) { //获取url 参数 return decodeURIComponent( @@ -648,10 +673,10 @@ this.$u.toast(res.data.msg); return } - let preViewMsg = res.data.data + let preViewMsg = res.data.data preViewMsg.isImport = this.goodsDetail.isImport - this.$store.commit('updatePreOrderMsg', preViewMsg); - console.log(res.data.data) + this.$store.commit('updatePreOrderMsg', preViewMsg); + console.log(res.data.data) // return uni.navigateTo({ url: "/pages/confirmOrder/confirmOrder" @@ -710,6 +735,12 @@ // console.log(this.shopItemInfo[result]) return this.shopItemInfo[result].inventory == 0 ? false : true; //匹配选中的数据的库存，若不为空返回true反之返回false }, + chooseAddress(e) { + console.log(e) + this.addressList = e.detail.value + this.address = this.addressList.join("-") + console.log(this.addressList) + }, //下载发圈素材图片 downloadPic(pics) { console.log(pics) @@ -765,58 +796,61 @@ } - diff --git a/pages/shop/shop.vue b/pages/shop/shop.vue index c434824..6fc2453 100644 --- a/pages/shop/shop.vue +++ b/pages/shop/shop.vue @@ -177,18 +177,18 @@ 邀请升级 - + 推荐砖石店铺 邀请好友·福利双赢 - 我的团队 + 我的邀请 呼朋唤友·享收益 - 我的邀请 + 我的团队 有福同享·真壕友 @@ -209,8 +209,6 @@ - - diff --git a/static/wx.png b/static/wx.png new file mode 100644 index 0000000000000000000000000000000000000000..15115b8de13a5ad55ec4a9fd32e1600e89c2f38e GIT binary patch literal 1786 zcmZ8idsLEl7{*#@rp&W*T$W{PE!VP(nWkwFTw3d0&5c7tKA3Dn})?^*T zl?pae5im`>pdxhB9Jn+s^Tx$W%gX?7Ad1RxcH!F}zxO-m``+`u&-*;j@BOa+=zGxI zbe$;#0x?H=!vi1?qt6zP$uj*L&qztA{;?{?`)C{l0&QG8Mie`!H3YJ<6bbhXOv;x_ z+Ox!a%~m{<&~>_&;TA;LcE{4M187tE%_o}GE^(XEZkH%G!iXtG7)+{!2uWJ~bDG6U zlf`i5et~Xke%@WT9_G#tX?xeB&C3+w%a70WyOpN&pbK2XHI~?5k3T6!URGaSTnZ=s zQOP5tm=U|{`7BSBrF#xeb)Lt+ykFH>cK`RynQdpoKUCMZ*cwEpseMd=!E`i&Bn&`C z#rX~fDT9jCis}eW#A(CS?owM+Z(q|(uC-#gpE9k!f+F^aCier4NjvS9U$j49vJ@JP z1IfOY!D^3A{NQU}uEn8(9#%^XB^XRs3?SvPrrlU5>)C ztQKy8vV1xVdCfQ#wJVWj^4wL%!{uuRk|r~Gu*zL_%jdo^vv>sAv=}N%Z25PULxJtT zw5h&m){S`cc%>gd>N8|yz{3(iko+1ZCN5YiVfkgs%iQ_zK)~tFXE?-ImS;Gpy+{SG z6PeM`q`*1?0y7yb+p`M<>q|ZoH|oY3Vxv_OUs^h6n` zbCS{bHe)4eIs14-8`BFFl`yIxR%Hq&-#|g_vROznx>$x;Gh&Uc!p6coPtBaG^?xc_ zV*5YJ+g&mUei+s1wgKlI$$kA(Ji<6s?EWib zLV`1Mr{cMVV{?HrHCu?Ab=x>Mm@vC=+7Gi@tR_7)Y&mWeN1lD+G>x^e_UI)}T;U7O zNEu<(b;vQ^d-MNy4NkU~bRFU6iqC5tkEV)wtrGz_Eyt34@LQWwZ3xJNT!7X~!n1~U zi>;;)8FK*-xl@%y;;wzcebZ&JTNC=;UHW;iMRp7zlgO1Vb_J1GU}lhiOoDCf)sk$8 zh@Y13>e7V`zy-*r#`w%3B`jwA#EP?=2h|MR9Do^&6dF!aVTDY^zfEfDvt?}Dt~^Y$ zh>5wW-K7eh>F0xdTSSd!Y}?zy2>2=G*a4MTp3E)?7mnqL5@-o|;)Kz*BwW0cJ7WtZ?d zSQibkOsS5H#Xm|MSAb?kI5CxG)dDOUc${JDm+h7`E~xM)*lM$CqM|^FO}C=2!Pe!U z3$4?l^&*QHv>MqHEr~rkO34+Qb3q=~q)7|WyjSYOP>0CQuB-7Q8Dgr1Dm*-`;FH8Y zd?cQ_&Ec?(d*VI&jw7wP|G-_H{^G07gJvj_79uIqLWZEn2Y5{9P7CBru|l!($;;5Q zmLPZ?x1#aR$RJY_ys5hI~yW}v%-f!+Y8ykpKiO}tF`-yW$ah(Zt;fLZ>4 z)1Z}*TYZ6Q^lWd(->CG|%^#QH`22!VtNmj`GwSWFgLqfe`fS;>dRYH6gCG&U@G`Fx G>Hh*ZM<)~j literal 0 HcmV?d00001 diff --git a/utils/http.interceptor.js b/utils/http.interceptor.js index ed9d2f7..42d34da 100644 --- a/utils/http.interceptor.js +++ b/utils/http.interceptor.js @@ -49,7 +49,7 @@ const install = (Vue, vm) => { config.header["X-Recook-ID"] = id config.header["X-Recook-Token"] = token config.header["Device-Type"] = "wxapp" - console.log("请求参数为========",config.data) + // console.log("请求参数为========",config.data) config.data = Encrypt(config.data) } // 响应拦截