Lee
/
mall-laonong
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

反馈样式修改-803

master
Lee-1203 2022-08-03 14:00:21 +08:00
parent 214eb8b551
commit 9b27a28eab
18 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/cart/cart.vue
View File

@ -65,7 +65,7 @@
skuId:'',
listData: [],
page:1,
size:15,
size:4,
total:0,
delIds:'', //删除ids
noMore:false, //没有更多

2
pages/cart/settlement.vue
View File

@ -187,7 +187,7 @@
let couponPrice = this.$toolAll.tools.addXiaoShu(couponNum);
// 积分可抵扣额度
let scoreNum = this.orderInfo.available_score*this.score_rule;
scoreNum = parseFloat(this.$toolAll.tools.addXiaoShu(scoreNum));
scoreNum = parseInt(this.$toolAll.tools.addXiaoShu(scoreNum));
let scorePrice = this.$toolAll.tools.addXiaoShu(scoreNum);
// 只有会员则扣

4
pagesA/order/detail.vue
View File

@ -75,7 +75,7 @@
</view>
<view class="flex mar-s20">
<text>折扣优惠</text>
<text class="color-red">{{orderDetail.discount_money>0?orderDetail.discount_money:0}}</text>
<text class="color-red">{{coupon_vip_price>0?coupon_vip_price:0}}</text>
</view>
<view class="flex mar-s20">
<text>积分抵扣</text>
@ -104,6 +104,7 @@
flag:true,
isLoading:false,
id:0, //订单id
coupon_vip_price:'', //折扣优惠
priceAll:'', //实际付款
backTag:'',
}
@ -131,6 +132,7 @@
if(res.code==0){
console.log(res,'订单详情')
this.orderDetail = res.data;
this.coupon_vip_price = this.$toolAll.tools.addXiaoShu(parseFloat(res.data.discount_money) + parseFloat(res.data.coupon_price));
this.priceAll = this.$toolAll.tools.addXiaoShu(parseFloat(res.data.balance) + parseFloat(res.data.wechat));
}
uni.hideLoading();

6
pagesB/shop-detail/shop-detail.vue
View File

@ -12,11 +12,11 @@
</view>
<view class="shop-content pad-all20 background-white">
<!-- 商品标题 -->
<view class="shop-title font40 mar-x30">{{shopDetail.name}}</view>
<view class="shop-title font40 mar-x35" style="padding: 30rpx 0 35rpx;">{{shopDetail.name}}</view>
<!-- 商品详情 -->
<view class="shop-body">
<view class="pull-title">
<view class="txt font32 pad-sx10">详情介绍</view>
<view class="pull-title mar-x20">
<view class="txt font30 pad-sx15">详情介绍</view>
<view class="line background-orange"></view>
</view>
<view class="body-txt font30 color-48">

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/nothing/nothing-page.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/share-coupon/share-coupon.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/status-nav/status-nav.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabbar/tabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/settlement.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/order/detail.js.map vendored
View File

File diff suppressed because one or more lines are too long

95
unpackage/dist/dev/mp-weixin/app.json vendored
View File

@ -1,51 +1,50 @@
{
"pages": [
"pages/index/index",
"pages/my/my",
"pages/cart/cart",
"pages/cart/settlement",
"pages/cart/finish",
"pages/login/login"
],
"subPackages": [
{
"root": "pagesA",
"pages": [
"address/address",
"recharge/recharge",
"integral/integral",
"distribution/distribution",
"coupon/coupon",
"order/order",
"order/detail"
]
},
{
"root": "pagesB",
"pages": [
"shop-detail/shop-detail",
"ucenter/ucenter",
"disclaimers/disclaimers",
"integral-rule/integral-rule",
"distributor/distributor"
]
}
],
"window": {
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#FFFFFF",
"navigationStyle": "custom",
"backgroundColor": "#FFFFFF",
"backgroundTextStyle": "light"
"pages": [
"pages/index/index",
"pages/my/my",
"pages/cart/cart",
"pages/cart/settlement",
"pages/cart/finish",
"pages/login/login"
],
"subPackages": [
{
"root": "pagesA",
"pages": [
"address/address",
"recharge/recharge",
"integral/integral",
"distribution/distribution",
"coupon/coupon",
"order/order",
"order/detail"
]
},
"permission": {
"scope.userLocation": {
"desc": "您的位置信息将用于小程序位置接口的效果展示"
}
},
"usingComponents": {
"nothing-page": "/components/nothing/nothing-page",
"status-nav": "/components/status-nav/status-nav"
},
"sitemapLocation": "sitemap.json"
{
"root": "pagesB",
"pages": [
"shop-detail/shop-detail",
"ucenter/ucenter",
"disclaimers/disclaimers",
"integral-rule/integral-rule",
"distributor/distributor"
]
}
],
"window": {
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#FFFFFF",
"navigationStyle": "custom",
"backgroundColor": "#FFFFFF",
"backgroundTextStyle": "light"
},
"permission": {
"scope.userLocation": {
"desc": "您的位置信息将用于小程序位置接口的效果展示"
}
},
"usingComponents": {
"nothing-page": "/components/nothing/nothing-page",
"status-nav": "/components/status-nav/status-nav"
}
}

2
unpackage/dist/dev/mp-weixin/pages/cart/cart.js vendored
View File

@ -269,7 +269,7 @@ var _publicApi = __webpack_require__(/*! @/jsFile/public-api.js */ 24); //
var _default = { data: function data() {return { statusHeight: uni.getSystemInfoSync().statusBarHeight, originalNum: 0, //当前输入框原值
maxNum: 99999, //最大可输入数量
minNum: 1, //最小可输入数量
skuId: '', listData: [], page: 1, size: 15, total: 0, delIds: '', //删除ids
skuId: '', listData: [], page: 1, size: 4, total: 0, delIds: '', //删除ids
noMore: false, //没有更多
isLoading: true, flag: true };}, onShow: function onShow() {uni.removeStorageSync('buyList');this.listData = []; // 查询购物车列表
this.getList();}, onReachBottom: function onReachBottom() {if (!this.noMore) {this.page++; // 获取商品列表

2
unpackage/dist/dev/mp-weixin/pages/cart/settlement.js vendored
View File

@ -378,7 +378,7 @@ var _default =
var couponPrice = this.$toolAll.tools.addXiaoShu(couponNum);
// 积分可抵扣额度
var scoreNum = this.orderInfo.available_score * this.score_rule;
scoreNum = parseFloat(this.$toolAll.tools.addXiaoShu(scoreNum));
scoreNum = parseInt(this.$toolAll.tools.addXiaoShu(scoreNum));
var scorePrice = this.$toolAll.tools.addXiaoShu(scoreNum);
// 只有会员则扣

3
unpackage/dist/dev/mp-weixin/pagesA/order/detail.js vendored
View File

@ -350,11 +350,12 @@ var _vuex = __webpack_require__(/*! vuex */ 13); //
//引入mapState
var _default = { data: function data() {return { orderDetail: {}, //订单详情
flag: true, isLoading: false, id: 0, //订单id
coupon_vip_price: '', //折扣优惠
priceAll: '', //实际付款
backTag: '' };}, onLoad: function onLoad(op) {if (op.id) {this.id = op.id;}if (op.backTag) {this.backTag = op.backTag;}this.getOrderDetail();}, // 分享到微信
onShareAppMessage: function onShareAppMessage() {}, // 分享到朋友圈
onShareTimeline: function onShareTimeline(res) {}, methods: { // 查询订单详情
getOrderDetail: function getOrderDetail() {var _this = this;uni.showLoading({ title: '加载中' });this.$requst.get('/api/user/order-detail', { id: this.id }).then(function (res) {if (res.code == 0) {console.log(res, '订单详情');_this.orderDetail = res.data;_this.priceAll = _this.$toolAll.tools.addXiaoShu(parseFloat(res.data.balance) + parseFloat(res.data.wechat));}uni.hideLoading();_this.isLoading = true;});}, // 取消订单
getOrderDetail: function getOrderDetail() {var _this = this;uni.showLoading({ title: '加载中' });this.$requst.get('/api/user/order-detail', { id: this.id }).then(function (res) {if (res.code == 0) {console.log(res, '订单详情');_this.orderDetail = res.data;_this.coupon_vip_price = _this.$toolAll.tools.addXiaoShu(parseFloat(res.data.discount_money) + parseFloat(res.data.coupon_price));_this.priceAll = _this.$toolAll.tools.addXiaoShu(parseFloat(res.data.balance) + parseFloat(res.data.wechat));}uni.hideLoading();_this.isLoading = true;});}, // 取消订单
cancleEv: function cancleEv(coding) {var _this2 = this;var params = { order_coding: coding //订单号
};this.$requst.post('/api/order/cancel', params).then(function (res) {if (res.code == 0) {_this2.$toolAll.tools.showToast('取消订单成功(*^▽^*)');uni.navigateTo({ url: '/pagesA/order/order' });} else {_this2.$toolAll.tools.showToast(res.msg);}});}, // 确认收货
affirmEv: function affirmEv(id) {var _this3 = this;var params = { order_id: id //订单号

2
unpackage/dist/dev/mp-weixin/pagesA/order/detail.wxml vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/mp-weixin/pagesB/shop-detail/shop-detail.wxml vendored
View File

@ -1 +1 @@
<view class="pad-x170"><block wx:if="{{scroolTop}}"><view class="scrool-top background-white" style="{{'height:'+(statusHeight+50+'px')+';'}}"></view></block><view data-event-opts="{{[['tap',[['backEv',['$event']]]]]}}" class="back-btn flex" style="{{'top:'+(statusHeight+'px')+';'}}" bindtap="__e"><view class="icon icon-return _i" style="{{'font-size:38rpx;'+('color:'+('#000000')+';')}}"></view></view><view class="shop-top-img"><image src="{{shopDetail.images[0]}}" mode="widthFix"></image></view><view class="shop-content pad-all20 background-white"><view class="shop-title font40 mar-x30">{{shopDetail.name}}</view><view class="shop-body"><view class="pull-title"><view class="txt font32 pad-sx10">详情介绍</view><view class="line background-orange"></view></view><view class="body-txt font30 color-48"><rich-text nodes="{{shopDetail.content}}"></rich-text></view></view></view><block wx:if="{{showSku}}"><view class="pull-bg"></view></block><block wx:if="{{showSku}}"><view class="shop-specs background-white border-box"><view class="specs-top flex"><view class="title font30">规格选择</view><view data-event-opts="{{[['tap',[['closeSpecs',['$event']]]]]}}" class="close" bindtap="__e"><image src="/static/icon/icon-close.png" mode="widthFix"></image></view></view><scroll-view class="specs-list" scroll-y="true"><block wx:for="{{shopSku}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeSpecs',[index]]]]]}}" class="{{['specs-item','border-box','radius20','mar-s20','pad-zy20','font36','flex',skuIndex==index?'active':'']}}" bindtap="__e"><text>{{item.title}}</text><text>{{"￥"+(vip_level>0?item.price:item.original_price)}}</text></view></block></scroll-view><view class="specs-btns flex"><view data-event-opts="{{[['tap',[['buyNow',['$event']]]]]}}" class="btn radius30 font36 color-ff background-orange flex" bindtap="__e">立即购买</view><view data-event-opts="{{[['tap',[['joinCart',['$event']]]]]}}" class="btn radius30 font36 color-ff background-grey flex" bindtap="__e">加入购物车</view></view></view></block><view class="shop-foot border-box background-white pad-all20"><view class="shop-footer background-grey pad-sx15 radius30 flex"><view data-event-opts="{{[['tap',[['goHome',['$event']]]]]}}" class="shop-nav font24 color-ff flex" bindtap="__e"><image src="/static/icon/icon-home.png" mode="widthFix"></image><text>首页</text></view><view data-event-opts="{{[['tap',[['goCart',['$event']]]]]}}" class="shop-cart background-white radius100 flex" bindtap="__e"><image src="/static/icon/icon-cart.png" mode="widthFix"></image><block wx:if="{{cartNum*1>=0&&cartNum*1<=99}}"><view class="shop-num radius100 font24 color-ff flex"><text>{{cartNum}}</text></view></block><block wx:if="{{cartNum*1>99}}"><view class="shop-num radius100 font24 color-ff flex"><text>99</text></view></block></view><view data-event-opts="{{[['tap',[['openSpecs',['$event']]]]]}}" class="shop-btn background-orange font36 color-48 radius30 flex" bindtap="__e">立即购买</view></view></view><share-coupon vue-id="b27c4170-1" spuId="{{shopDetail.id}}" bind:__l="__l"></share-coupon></view>
<view class="pad-x170"><block wx:if="{{scroolTop}}"><view class="scrool-top background-white" style="{{'height:'+(statusHeight+50+'px')+';'}}"></view></block><view data-event-opts="{{[['tap',[['backEv',['$event']]]]]}}" class="back-btn flex" style="{{'top:'+(statusHeight+'px')+';'}}" bindtap="__e"><view class="icon icon-return _i" style="{{'font-size:38rpx;'+('color:'+('#000000')+';')}}"></view></view><view class="shop-top-img"><image src="{{shopDetail.images[0]}}" mode="widthFix"></image></view><view class="shop-content pad-all20 background-white"><view class="shop-title font40 mar-x35" style="padding:30rpx 0 35rpx;">{{shopDetail.name}}</view><view class="shop-body"><view class="pull-title mar-x20"><view class="txt font30 pad-sx15">详情介绍</view><view class="line background-orange"></view></view><view class="body-txt font30 color-48"><rich-text nodes="{{shopDetail.content}}"></rich-text></view></view></view><block wx:if="{{showSku}}"><view class="pull-bg"></view></block><block wx:if="{{showSku}}"><view class="shop-specs background-white border-box"><view class="specs-top flex"><view class="title font30">规格选择</view><view data-event-opts="{{[['tap',[['closeSpecs',['$event']]]]]}}" class="close" bindtap="__e"><image src="/static/icon/icon-close.png" mode="widthFix"></image></view></view><scroll-view class="specs-list" scroll-y="true"><block wx:for="{{shopSku}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeSpecs',[index]]]]]}}" class="{{['specs-item','border-box','radius20','mar-s20','pad-zy20','font36','flex',skuIndex==index?'active':'']}}" bindtap="__e"><text>{{item.title}}</text><text>{{"￥"+(vip_level>0?item.price:item.original_price)}}</text></view></block></scroll-view><view class="specs-btns flex"><view data-event-opts="{{[['tap',[['buyNow',['$event']]]]]}}" class="btn radius30 font36 color-ff background-orange flex" bindtap="__e">立即购买</view><view data-event-opts="{{[['tap',[['joinCart',['$event']]]]]}}" class="btn radius30 font36 color-ff background-grey flex" bindtap="__e">加入购物车</view></view></view></block><view class="shop-foot border-box background-white pad-all20"><view class="shop-footer background-grey pad-sx15 radius30 flex"><view data-event-opts="{{[['tap',[['goHome',['$event']]]]]}}" class="shop-nav font24 color-ff flex" bindtap="__e"><image src="/static/icon/icon-home.png" mode="widthFix"></image><text>首页</text></view><view data-event-opts="{{[['tap',[['goCart',['$event']]]]]}}" class="shop-cart background-white radius100 flex" bindtap="__e"><image src="/static/icon/icon-cart.png" mode="widthFix"></image><block wx:if="{{cartNum*1>=0&&cartNum*1<=99}}"><view class="shop-num radius100 font24 color-ff flex"><text>{{cartNum}}</text></view></block><block wx:if="{{cartNum*1>99}}"><view class="shop-num radius100 font24 color-ff flex"><text>99</text></view></block></view><view data-event-opts="{{[['tap',[['openSpecs',['$event']]]]]}}" class="shop-btn background-orange font36 color-48 radius30 flex" bindtap="__e">立即购买</view></view></view><share-coupon vue-id="b27c4170-1" spuId="{{shopDetail.id}}" bind:__l="__l"></share-coupon></view>