diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue index 2011efe..6fa8404 100644 --- a/components/orderGoods/index.vue +++ b/components/orderGoods/index.vue @@ -30,11 +30,13 @@ {{item.productInfo.store_name}} - x {{item.cart_num}} + - {{item.productInfo.attrInfo.suk}} + + {{item.productInfo.attrInfo.suk}} + x {{item.cart_num}} - + {{$t(`￥`)}}{{item.productInfo.attrInfo.price}} @@ -55,10 +57,10 @@ {{$t(`评价`)}} - - {{$t(`申请退款`)}} + {{$t(`申请退款`)}} --> {{$t(`查看物流`)}} @@ -257,6 +259,7 @@ background: #fff; margin: 0 24rpx; border-radius: 20rpx; + margin-top: 20rpx; } .goodWrapper{ diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue index 5cfeb5a..6fc3e3e 100644 --- a/components/productWindow/index.vue +++ b/components/productWindow/index.vue @@ -42,7 +42,7 @@ - {{$t(`数量`)}} + {{$t(`数量`)}}只能是【{{stepNum}}】的倍数 {{$t(`限购`)}}{{limitNum + unitName}} | @@ -106,6 +106,10 @@ type: Number, value: 0 }, + stepNum:{ + type: Number, + value: 1 + }, minQty: { type: Number, value: 0 diff --git a/pages.json b/pages.json index 4ec29fd..9d61091 100644 --- a/pages.json +++ b/pages.json @@ -497,7 +497,7 @@ { "path": "user_info/index", "style": { - "navigationBarTitleText": "设置", + "navigationBarTitleText": "账户管理", "app-plus": { // #ifdef APP-PLUS "titleNView": { diff --git a/pages/goods/cashier/index.vue b/pages/goods/cashier/index.vue index 10f836a..617870b 100644 --- a/pages/goods/cashier/index.vue +++ b/pages/goods/cashier/index.vue @@ -12,9 +12,9 @@ - + @@ -59,7 +59,8 @@ checked: false, datatime: 1676344056, //支付方式 - cartArr: [{ + cartArr: [ + { "name": this.$t(`微信支付`), "icon": "icon-weixin2", value: 'weixin', @@ -635,6 +636,8 @@ font-size: 34rpx; font-weight: 500; line-height: 41rpx; + position: relative; + top: -10rpx; } .num { @@ -665,7 +668,7 @@ .payment { width: 690rpx; - border-radius: 14rpx 14rpx; + border-radius: 20rpx; background-color: #fff; z-index: 999; margin: 0 30rpx; @@ -699,7 +702,7 @@ } .icon-xuanzhong11 { - color: #E93323 !important; + color: #A8D178 !important; } .payment .item { @@ -788,7 +791,7 @@ height: 90rpx; border-radius: 45rpx; color: #FFFFFF; - background-color: #E93323; + background-color: #A8D178; } diff --git a/pages/goods/goods_search/index.vue b/pages/goods/goods_search/index.vue index 17ab796..79f3439 100644 --- a/pages/goods/goods_search/index.vue +++ b/pages/goods/goods_search/index.vue @@ -350,7 +350,7 @@ } .goodsContainer{ - background: #F5F6F7; + // background: #F5F6F7; padding: 24rpx; .goodList { background: #fff; diff --git a/pages/goods/order_confirm/index.vue b/pages/goods/order_confirm/index.vue index aae3896..44a8468 100644 --- a/pages/goods/order_confirm/index.vue +++ b/pages/goods/order_confirm/index.vue @@ -186,29 +186,32 @@ - - {{$t(`总计`)}}： + + {{$t(`总计`)}}： {{$t(`￥`)}}{{allPrice || 0}} - - {{$t(`本次支付`)}}： + + {{$t(`本次支付`)}}： {{$t(`￥`)}}{{priceGroup.sum_price_ding || 0}} - {{priceGroup.percentage}}定金 + {{priceGroup.percentage||0}}定金 - - {{$t(`待支付尾款`)}}： - + + {{$t(`待支付尾款`)}}： + {{$t(`￥`)}}{{priceGroup.sum_price_wei || 0}} - - {{$t(`销售编码`)}}： + + {{$t(`销售编码`)}}： - {{$t(`￥`)}}{{allPrice || 0}} + + @@ -210,13 +210,13 @@ @openSubcribe="openSubcribe" > -
+ -
+ @@ -251,7 +251,7 @@ - {{ $t(`订单号`) }}： + {{ $t(`订单编号`) }}： {{ orderInfo.order_id }} @@ -263,7 +263,11 @@ - {{ $t(`下单时间`) }}： + {{ $t(`定金时间`) }}： + {{ (orderInfo.add_time_y || '') + ' ' + (orderInfo.add_time_h || 0) }} + + + {{ $t(`尾款时间`) }}： {{ (orderInfo.add_time_y || '') + ' ' + (orderInfo.add_time_h || 0) }} @@ -422,13 +426,13 @@ {{ $t(`取消订单`) }} {{ $t(`立即付款`) }} - {{ cartInfo.length > 1 ? $t(`批量退款`) : $t(`申请退款`) }} - + --> + {{$t(`全部`)}} - {{ orderData.order_count || 0 }} + - {{$t(`待付款`)}} - {{ orderData.unpaid_count || 0 }} + {{$t(`待支付`)}} + - {{$t(`待发货`)}} - {{ orderData.unshipped_count || 0 }} + {{$t(`备货中`)}} + + + + {{$t(`待付尾款`)}} + - {{$t(`待收货`)}} - {{ orderData.received_count || 0 }} + {{$t(`运输中`)}} + - {{$t(`待评价`)}} - {{ orderData.evaluated_count || 0 }} + {{$t(`已完成`)}} + @@ -53,19 +57,20 @@ {{ item._add_time }} {{$t(`线下付款,未支付`)}} - {{$t(`待付款`)}} + {{$t(`待付尾款`)}} + {{$t(`待支付`)}} - {{$t(`待发货`)}} + {{$t(`备货中`)}} ，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}} {{$t(`待核销`)}} ，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}} - {{$t(`待收货`)}} + {{$t(`运输中`)}} ，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}} - {{$t(`待评价`)}} + {{$t(`已完成`)}} ，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}} {{$t(`已完成`)}} @@ -85,14 +90,19 @@ - + {{ items.productInfo.store_name }} - - {{$t(`￥`)}}{{ items.productInfo.attrInfo.price }} + + {{$t(`￥`)}}{{ items.productInfo.attrInfo.price }} + x{{ items.cart_num }} + + + {{$t(`￥`)}}{{ items.productInfo.price }} + + x{{ items.cart_num }} - {{$t(`￥`)}}{{ items.productInfo.price }} - x{{ items.cart_num }} + {{ items.refund_num }}{{$t(`件退款中`)}} @@ -100,15 +110,18 @@ - {{$t(`共`)}}{{ item.total_num || 0 }}{{$t(`件商品，总金额`)}} - {{$t(`￥`)}}{{ item.pay_price }} + 总计：¥{{item.total_price}} + 本次支付：¥{{item.pay_price}} + {{item.percentage}}定金 + {{$t(`取消订单`)}} {{$t(`立即付款`)}} + @click="goPay(item.pay_price, item.order_id)">{{$t(`支付定金`)}} @@ -462,20 +476,20 @@ } .my-order .nav { - background-color: #fff; - width: 690rpx; - height: 140rpx; + // background-color: #fff; + width: 100%; + // height: 140rpx; border-radius: 6rpx; - margin: -73rpx auto 0 auto; + margin: 0rpx auto 0 auto; } .my-order .nav .item { text-align: center; - font-size: 26rpx; + font-size: 30rpx; color: #282828; - width: 3rem; + // width: 3rem; padding: 27rpx 0; - border-bottom: 5rpx solid transparent; + border-bottom: 8rpx solid transparent; } .my-order .nav .item.on { @@ -501,6 +515,7 @@ background-color: #fff; border-radius: 6rpx; margin-bottom: 14rpx; + border-radius: 20rpx; } .my-order .list .item .title { @@ -524,17 +539,17 @@ } .my-order .list .item .item-info .pictrue { - width: 120rpx; - height: 120rpx; + width: 160rpx; + height: 160rpx; /deep/, /deep/image, /deep/.easy-loadimage, /deep/uni-image { - width: 120rpx; - height: 120rpx; - border-radius: 6rpx; + width: 160rpx; + height: 160rpx; + border-radius: 20rpx; } } @@ -545,29 +560,36 @@ } .my-order .list .item .item-info .text { - width: 486rpx; + // width: 486rpx; font-size: 28rpx; color: #999; margin-top: 6rpx; - display: flex; + // display: flex; line-height: 39rpx; + flex: 1; + margin-left: 20rpx; + } .my-order .list .item .item-info .text .name { width: 306rpx; color: #282828; - height: 78rpx; + // height: 78rpx; } .my-order .list .item .item-info .text .money { - text-align: right; + // text-align: right; + display: flex; + justify-content: space-between; + width: 100%; flex: 1; + margin-top:30rpx; } .my-order .list .item .totalPrice { font-size: 26rpx; color: #282828; - text-align: right; + // text-align: right; margin: 27rpx 0 0 30rpx; padding: 0 30rpx 30rpx 0; border-bottom: 1rpx solid #eee; diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index a2c9386..10b1dca 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -326,6 +326,7 @@ @iptCartNum="iptCartNum" id="product-window" :is_vip="is_vip" + :stepNum="stepNum" @getImg="showImg" :is_virtual="storeInfo.is_virtual" > @@ -415,6 +416,7 @@ /> + @@ -478,6 +480,7 @@ export default { data() { let that = this; return { + stepNum:1, imgHost: HTTP_REQUEST_URL, sysHeight: sysHeight, noGoods: false, @@ -885,7 +888,7 @@ export default { * 购物车数量加和数量减 * */ - ChangeCartNum: function (changeValue) { + ChangeCartNum (changeValue) { //changeValue:是否 加|减 //获取当前变动属性 let productSelect = this.productValue[this.attrValue]; @@ -896,13 +899,13 @@ export default { let num = this.attr.productSelect; if (productSelect === undefined || (this.storeInfo.limit_num && num.cart_num >= this.storeInfo.limit_num && changeValue)) return; if (changeValue) { - num.cart_num++; + num.cart_num+=this.stepNum; if (num.cart_num > stock) { this.$set(this.attr.productSelect, 'cart_num', stock ? stock : this.storeInfo.min_qty); this.$set(this, 'cart_num', stock ? stock : 1); } } else { - num.cart_num--; + num.cart_num-=this.stepNum; if (num.cart_num < 1) { this.$set(this.attr.productSelect, 'cart_num', this.storeInfo.min_qty); this.$set(this, 'cart_num', 1); @@ -1019,7 +1022,8 @@ export default { that.$set(that, 'systemStore', res.data.system_store); that.$set(that, 'storeSelfMention', res.data.store_self_mention); that.$set(that, 'good_list', goodArray); - + that.$set(that, 'stepNum', res.data.storeInfo.min_qty); + if (!storeInfo.wechat_code) { // #ifdef H5 this.codeVal = window.location.origin + '/pages/goods_details/index?id=' + this.id + '&spid=' + this.$store.state.app.uid; diff --git a/pages/user/index.vue b/pages/user/index.vue index 1593f5f..0701ac6 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -130,7 +130,7 @@ + @click="goMenuPage('/pages/users/user_bill/index')"> {{userInfo.now_money || 0}} {{$t('余额(元)')}} @@ -390,34 +390,40 @@ orderMenu: [{ pic: '/static/images/m1.png', img: 'icon-daifukuan', - title: '待付款', + title: '待支付', url: '/pages/goods/order_list/index?status=0', }, { pic: '/static/images/m2.png', img: 'icon-daifahuo', - title: '待发货', + title: '备货中', url: '/pages/goods/order_list/index?status=1' }, { pic: '/static/images/m3.png', img: 'icon-daishouhuo', - title: '待收货', - url: '/pages/goods/order_list/index?status=2' + title: '待付尾款', + url: '/pages/goods/order_list/index?status=6' }, { pic: '/static/images/m4.png', - img: 'icon-daipingjia', - title: '待评价', - url: '/pages/goods/order_list/index?status=3' + img: 'icon-daishouhuo', + title: '运输中', + url: '/pages/goods/order_list/index?status=2' }, { pic: '/static/images/m5.png', - img: 'icon-a-shouhoutuikuan', - title: '售后/退款', - url: '/pages/users/user_return_list/index' + img: 'icon-daipingjia', + title: '已完成', + url: '/pages/goods/order_list/index?status=3' }, + // { + // pic: '/static/images/m5.png', + // img: 'icon-a-shouhoutuikuan', + // title: '售后/退款', + // url: '/pages/users/user_return_list/index' + // }, ], imgUrls: [], autoplay: true, @@ -606,21 +612,24 @@ that.$store.commit("SETUID", res.data.uid); that.orderMenu.forEach((item, index) => { switch (item.title) { - case '待付款': + case '待支付': item.num = res.data.orderStatusNum.unpaid_count break - case '待发货': + case '备货中': item.num = res.data.orderStatusNum.unshipped_count break - case '待收货': + case '待付尾款': + item.num = res.data.orderStatusNum.unshipped_count + break + case '运输中': item.num = res.data.orderStatusNum.received_count break - case '待评价': + case '已完成': item.num = res.data.orderStatusNum.evaluated_count break - case '售后/退款': - item.num = res.data.orderStatusNum.refunding_count - break + // case '售后/退款': + // item.num = res.data.orderStatusNum.refunding_count + // break } }) uni.stopPullDownRefresh(); diff --git a/pages/users/shiming/index.vue b/pages/users/shiming/index.vue index 2c01d28..d456641 100644 --- a/pages/users/shiming/index.vue +++ b/pages/users/shiming/index.vue @@ -100,6 +100,7 @@ + diff --git a/pages/users/user_address_list/index.vue b/pages/users/user_address_list/index.vue index 3016270..2cd1550 100644 --- a/pages/users/user_address_list/index.vue +++ b/pages/users/user_address_list/index.vue @@ -408,6 +408,7 @@ background-color: #fff; /* padding: 0 30rpx; */ margin-bottom: 12rpx; + border-radius: 20rpx; } .address-management .item .address { diff --git a/pages/users/user_bill/index.vue b/pages/users/user_bill/index.vue index 703a71c..3501623 100644 --- a/pages/users/user_bill/index.vue +++ b/pages/users/user_bill/index.vue @@ -10,8 +10,8 @@ {{item.time}} - - + + {{$t(vo.title)}} {{vo.add_time}} @@ -30,6 +30,7 @@ + diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue index b580764..82b3789 100644 --- a/pages/users/user_info/index.vue +++ b/pages/users/user_info/index.vue @@ -95,7 +95,7 @@ - + {{$t(`地址管理`)}} @@ -125,7 +125,7 @@ {{$t(`实名认证`)}} - {{$t(`未认证`)}} + {{userInfo.renzheng.status?(userInfo.renzheng.status==0?'未认证':userInfo.renzheng.status==1?'已通过':userInfo.renzheng.status==2?'已拒绝':userInfo.renzheng.status==3?'审核中':''):'未认证'}} @@ -152,6 +152,7 @@ + diff --git a/static/css/style.scss b/static/css/style.scss index b9a2cf6..9f84806 100644 --- a/static/css/style.scss +++ b/static/css/style.scss @@ -243,21 +243,22 @@ .goodWrapper .item { margin-left: 30rpx; margin-right: 30rpx; - height: 180rpx; + // height: 180rpx; display: flex; align-items: center; flex-wrap: nowrap; + padding: 30rpx 0; } .goodWrapper .item .pictrue { - width: 130rpx; - height: 130rpx; + width: 160rpx; + height: 160rpx; } .goodWrapper .item .pictrue image { width: 100%; height: 100%; - border-radius: 6rpx + border-radius: 20rpx } .goodWrapper .item .text { @@ -273,8 +274,9 @@ } .goodWrapper .item .text .num { - font-size: 26rpx; - color: #868686 + + font-size: 30rpx; + color: #333333; } .goodWrapper .item .text .attr {