diff --git a/api/request.js b/api/request.js new file mode 100644 index 0000000..4d43da7 --- /dev/null +++ b/api/request.js @@ -0,0 +1,39 @@ +import config from '../config.js' +const json_data={ + appcode:'SHISE' ,//应用编码 + appchannel:'FXXXXHUAWEI' ,//应用发布渠道 + appver: '1.0.0',//应用版本 + appname:'cnic_buyer' ,//应用名称 + manufacturer:'HUAWEI' ,//设备生产商 + phonebrand:'HORNOR' ,//设备品牌 + phonetype:'X30' ,//设备型号 + phoneos:'ANDROID'// 设备系统 +} +const httpRequest = (params) => { + uni.showLoading({ + title: "努力加载中..." + }); + + let httpOptions = { + url: config.apiUri + params.url, + data: params.data, + method: params.method, + header: {'Content-Type':'application/x-www-form-urlencoded; charset=UTF-8'} + }; + return new Promise((resolve, reject) => { + uni.request({ + ...httpOptions, + success: res => { + uni.hideLoading(); + resolve(res); + }, + fail: err => { + uni.hideLoading(); + reject(err); + } + }) + }) + +} + +export default httpRequest; diff --git a/common/common.scss b/common/common.scss index ae1c8b7..98d70e6 100644 --- a/common/common.scss +++ b/common/common.scss @@ -113,6 +113,114 @@ } } +// 谈判细节 +.order_popup{ + position: fixed; + z-index: 999; + background-color: white; + width: 100%; + bottom: 0; + + .order_popup_title{ + position: relative; + font-size: 32rpx; + font-weight: bold; + border-bottom: 1px solid #E2E2E2; + display: flex; + align-items: center; + justify-content: center; + padding-top: 44.67rpx; + padding-bottom: 30.67rpx; + + image{ + width: 21.33rpx; + height: 21.33rpx; + position: absolute; + right: 26rpx; + top: 50%; + margin-top: -5.5rpx; + } + .order_popup_title_span{ + color: #B22234; + } + + } + .order_popup_commodity{ + border-bottom:1px solid #E2E2E2 ; + padding-bottom: 40rpx; + } + .order_popup_coupons{ + padding:0 26.67rpx; + padding-top: 28rpx; + padding-bottom: 106.67rpx; + + } + + .order_popup_pay{ + padding: 0 26.67rpx; + padding-bottom: 56.67rpx; + + .pay_item{ + border-bottom: 1px solid #EEEEEE; + padding: 13.33rpx 0; + display: flex; + align-items: center; + font-size: 28rpx; + &:nth-child(4){ + border-bottom: none + } + .pay_item_select{ + width: 29.33rpx; + height: 29.33rpx; + margin-right: 26rpx; + + } + .pay_item_right{ + display: flex; + align-items: center; + + image{ + width: 74.67rpx; + height: 74.67rpx; + margin-right: 28.67rpx; + } + } + + + } + button{ + background: black; + color: white; + height: 88rpx; + line-height: 88rpx; + font-size: 26.67rpx; + font-weight: bold; + margin-top: 33.33rpx; + } + } + .order_popup_points{ + padding-bottom: 63.33rpx; + padding-left: 47.33rpx; + padding-top: 34.67rpx; + font-size: 28rpx; + + .points_item{ + display: flex; + align-items: center; + margin-bottom: 40rpx; + &:last-child{ + margin-bottom: 0; + } + + image{ + width: 29.33rpx; + height: 29.33rpx; + margin-right: 26rpx; + + } + } + } +} // 遮罩层 .mask{ diff --git a/common/scss/order.scss b/common/scss/order.scss index a58442c..4065f49 100644 --- a/common/scss/order.scss +++ b/common/scss/order.scss @@ -194,114 +194,7 @@ } } -// 谈判细节 -.order_popup{ - position: fixed; - z-index: 999; - background-color: white; - width: 100%; - bottom: 0; - - .order_popup_title{ - position: relative; - font-size: 32rpx; - font-weight: bold; - border-bottom: 1px solid #E2E2E2; - display: flex; - align-items: center; - justify-content: center; - padding-top: 44.67rpx; - padding-bottom: 30.67rpx; - - image{ - width: 21.33rpx; - height: 21.33rpx; - position: absolute; - right: 26rpx; - top: 50%; - margin-top: -5.5rpx; - } - .order_popup_title_span{ - color: #B22234; - } - - } - .order_popup_commodity{ - border-bottom:1px solid #E2E2E2 ; - padding-bottom: 40rpx; - } - .order_popup_coupons{ - padding:0 26.67rpx; - padding-top: 28rpx; - padding-bottom: 106.67rpx; - - } - - .order_popup_pay{ - padding: 0 26.67rpx; - padding-bottom: 56.67rpx; - - .pay_item{ - border-bottom: 1px solid #EEEEEE; - padding: 13.33rpx 0; - display: flex; - align-items: center; - font-size: 28rpx; - &:nth-child(4){ - border-bottom: none - } - .pay_item_select{ - width: 29.33rpx; - height: 29.33rpx; - margin-right: 26rpx; - - } - .pay_item_right{ - display: flex; - align-items: center; - - image{ - width: 74.67rpx; - height: 74.67rpx; - margin-right: 28.67rpx; - } - } - - - } - button{ - background: black; - color: white; - height: 88rpx; - line-height: 88rpx; - font-size: 26.67rpx; - font-weight: bold; - margin-top: 33.33rpx; - } - } - .order_popup_points{ - padding-bottom: 63.33rpx; - padding-left: 47.33rpx; - padding-top: 34.67rpx; - font-size: 28rpx; - - .points_item{ - display: flex; - align-items: center; - margin-bottom: 40rpx; - &:last-child{ - margin-bottom: 0; - } - - image{ - width: 29.33rpx; - height: 29.33rpx; - margin-right: 26rpx; - - } - } - } -} + // 进度条 .logistics_details{ diff --git a/config.js b/config.js new file mode 100644 index 0000000..90d05db --- /dev/null +++ b/config.js @@ -0,0 +1,5 @@ +var weburl='https://en.meixx.com/mapi/api_v2011.php'; +export default { + apiUri: 'http://'+weburl+'/api/', + imgUri: 'http://'+weburl+'/', +} \ No newline at end of file diff --git a/pages.json b/pages.json index ddae902..e357f49 100644 --- a/pages.json +++ b/pages.json @@ -204,6 +204,12 @@ "style": { "titleNView":false } + }, + { + "path": "pages/index/flashSale", + "style": { + "titleNView":false + } } ], "globalStyle": { diff --git a/pages/index/flashSale.vue b/pages/index/flashSale.vue new file mode 100644 index 0000000..62fae1e --- /dev/null +++ b/pages/index/flashSale.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index af1a446..0193feb 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -77,13 +77,16 @@ - - Flash Sale - - - + + + Flash Sale + + + + - + + diff --git a/pages/login/verifyEmail.vue b/pages/login/verifyEmail.vue index 7cd5bc3..bc47177 100644 --- a/pages/login/verifyEmail.vue +++ b/pages/login/verifyEmail.vue @@ -6,11 +6,11 @@ The code is incorrect. - + Resend code - - + + @@ -27,7 +27,7 @@ export default { data() { return { - + isShow:false } }, methods:{ diff --git a/pages/order/refundDetails.vue b/pages/order/refundDetails.vue index 06daa04..e79f2af 100644 --- a/pages/order/refundDetails.vue +++ b/pages/order/refundDetails.vue @@ -181,7 +181,7 @@ data() { return { // 0、售后已取消 1、商家驳回申请 2、待买家退货 3、待商家收货 4、待退款 5、等待商家审核 6、退款成功 - details_index:0, + details_index:5, isShow:false, } }, diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue index 445cc9a..cdbbd4d 100644 --- a/pages/productDetails/index.vue +++ b/pages/productDetails/index.vue @@ -128,7 +128,7 @@ - + Shipping security @@ -197,7 +197,7 @@ Other options - + US$314.00 @@ -226,7 +226,39 @@ - + + + + Shipping security + + + + + Support 7-day return and replacement + + If there are quality problems or spillage damage within 7 + days after receiving the goods, you can apply for return + and replacement Processing + + + + Private service + + The package is tightly packed and there is no sensitive + information on the express list + + + + Genuine guarantee + + t is guaranteed that there is no problem. All goods are + original and genuine products and brand authorized sales, + so as to eliminate one Cut fake goods to ensure your + shopping + + + + @@ -272,6 +304,7 @@ navWidth:'80rpx', current:0, isVedio:false, + isSecurity:false, info: [{ colorClass: 'uni-bg-red', url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/094a9dc0-50c0-11eb-b680-7980c8a877b8.jpg', @@ -336,6 +369,40 @@ border-radius: 25rpx; } } + .securityDetails{ + padding-top: 50.67rpx; + padding-bottom: 120rpx; + padding-left: 54.67rpx; + padding-right: 45.33rpx; + + .securityDetails_item{ + margin-bottom: 52rpx; + font-size: 24.67rpx; + font-weight: 400; + color: #999999; + &:last-child{ + margin-bottom: 0; + } + .securityDetails_item_title{ + position: relative; + color: #333333; + font-size: 30rpx; + font-weight: 500; + margin-bottom: 10.33rpx; + &:before{ + content: ""; + width: 6rpx; + height: 6rpx; + position: absolute; + border-radius: 50%; + background-color: #999999; + left: -25.67rpx; + top: 50%; + margin-top: -3rpx; + } + } + } + } .variations_select_size{ margin-left: 20.67rpx; display: flex; diff --git a/pages/productDetails/review.vue b/pages/productDetails/review.vue index 7f097da..bfd094d 100644 --- a/pages/productDetails/review.vue +++ b/pages/productDetails/review.vue @@ -20,9 +20,6 @@ - - US$314.00 - diff --git a/static/img/add.png b/static/img/add.png new file mode 100644 index 0000000..3229c01 Binary files /dev/null and b/static/img/add.png differ