Skip to content

M
mallapp
Commit 0f0ff7c6 authored by 吴春's avatar 吴春
Browse files
Options

11

parents ffdf1cc2 7d86f027
Show whitespace changes
Inline Side-by-side
Showing with 2009 additions and 1934 deletions
components/auth/index.vue
View file @ 0f0ff7c6
<template>
<!-- v-if="setting&&setting.is_show_auth==1" -->
<div class="auth-page">
<u-popup
v-model="showDialog"
......@@ -21,7 +22,6 @@
v-if="AppConfig.TenantId!=18"
@tap="showLogin == true ? getUserProfile() : ''"
></button>
<button v-else
:style="sureStyle"
class="hotsopt"
......@@ -63,6 +63,7 @@ export default {
AppConfig:{
TenantId:0
},
setting: {},
};
},
created() {
......@@ -78,6 +79,9 @@ export default {
let y = this.pageinfo.hotspot_cancel;
this.sureStyle = `height:${x.height}rpx;width:${x.width}rpx;left:${x.left}rpx;top:${x.top}rpx;`;
this.cancelStyle = `height:${y.height}rpx;width:${y.width}rpx;left:${y.left}rpx;top:${y.top}rpx;`;
let set = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata").mall.setting : {};
this.setting = set;
},
methods: {
//授权获取手机号码
......@@ -209,6 +213,7 @@ export default {
if (res.resultCode == 1) {
obj.OpenId = res.data;
that.getLogin(obj);
}
}
);
......@@ -289,7 +294,31 @@ export default {
//不是相亲模式的时候去更新头像和昵称
that.updateuserinfo(that.msg); //更新用户头像
}
if(uni.getStorageSync('jzTravelOpenId')){
that.SetMemberBindCustomer()
}
}
}
);
},
SetMemberBindCustomer(){
let that = this;
that.request2({
url: "/api/MemberUser/SetMemberBindCustomer",
data: {
Id: that.msg.Id,
CustomerOpenId: uni.getStorageSync('jzTravelOpenId')
},
},
(res) => {
if (res.resultCode == 1) {
uni.removeStorageSync('jzTravelOpenId');
}
},(err) => {
// uni.showToast({
// title: err.message,
// icon: "none",
// });
}
);
},
......
components/miaiactivityCustom/style5.vue
View file @ 0f0ff7c6
......@@ -147,7 +147,11 @@
width: 24px;
text-align: right;
}
.her_Two_study { overflow-x: auto !important; display: flex; white-space: nowrap; }
.her_Two_study {
overflow-x: auto !important;
display: flex;
white-space: nowrap;
}
.style_five_label{
float:left;
padding: 0px 5px;
......
components/studyArticle/style5.vue
View file @ 0f0ff7c6
......@@ -136,7 +136,11 @@
width: 24px;
text-align: right;
}
.her_Two_study { overflow-x: auto !important; display: flex; white-space: nowrap; }
.her_Two_study {
overflow-x: auto !important;
display: flex;
white-space: nowrap;
}
.style_five_label{
float:left;
padding: 0px 5px;
......
pages.json
View file @ 0f0ff7c6
......@@ -123,134 +123,134 @@
}
]
},
// {
// "root": "pages/mySupplier",
// "pages": [{
// "path": "index/index",
// "style": {
// "navigationStyle": "custom"
// }
// }, {
// "path": "myBill"
// }, {
// "path": "billDetails"
// }, {
// "path": "mySupplierList"
// }, {
// "path": "myProduct"
// }, {
// "path": "supplierOrder"
// }
{
"root": "pages/mySupplier",
"pages": [{
"path": "index/index",
"style": {
"navigationStyle": "custom"
}
}, {
"path": "myBill"
}, {
"path": "billDetails"
}, {
"path": "mySupplierList"
}, {
"path": "myProduct"
}, {
"path": "supplierOrder"
}
// ]
// },
// {
// "root": "pages/share",
// "pages": [{
// "path": "index/index",
// "style": {
// "navigationStyle": "custom"
// }
// },
// {
// "path": "add/add"
// },
// {
// "path": "cash/cash"
// },
// {
// "path": "level/level"
// },
// {
// "path": "level/level_t"
// },
// {
// "path": "examine"
// },
// {
// "path": "buyVip/index"
// },
// {
// "path": "vipBuyCommission/vipBuyCommission"
// },
// {
// "path": "buyRecord/index"
// },
// {
// "path": "buyInterest/index"
// },
// {
// "path": "salesvolume", //销售额
// "style": {
// "navigationStyle": "custom"
// }
// },
// {
// "path": "time/choiceDate" //时间选择
// }
// ]
// },
// {
// "root": "pages/share-team",
// "pages": [{
// "path": "share-team"
// }, {
// "path": "share-detail",
// "style": {
// "navigationStyle": "custom"
// }
// }]
// },
// {
// "root": "pages/share-order",
// "pages": [{
// "path": "share-order"
// }]
// },
// {
// "root": "pages/share-qrcode",
// "pages": [{
// "path": "share-qrcode"
// }, {
// "path": "share-select-school"
// }]
// },
// {
// "root": "pages/share-money",
// "pages": [{
// "path": "share-money"
// }]
// },
// {
// "root": "pages/coupon",
// "pages": [{
// "path": "list/list"
// },
// {
// "path": "details/details"
// },
// {
// "path": "index/index"
// },
// {
// "path": "cards/list" //储蓄卡列表
// },
// {
// "path": "cards/carddetailed" //卡片明细
// }, {
// "path": "cards/cardsreceive", //储蓄卡的领取
// "style": {
// "navigationStyle": "custom"
// }
// },
// {
// "path": "cards/purchase", //购买储蓄卡
// "style": {
// "navigationStyle": "custom"
// }
// }
// ]
// },
]
},
{
"root": "pages/share",
"pages": [{
"path": "index/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "add/add"
},
{
"path": "cash/cash"
},
{
"path": "level/level"
},
{
"path": "level/level_t"
},
{
"path": "examine"
},
{
"path": "buyVip/index"
},
{
"path": "vipBuyCommission/vipBuyCommission"
},
{
"path": "buyRecord/index"
},
{
"path": "buyInterest/index"
},
{
"path": "salesvolume", //销售额
"style": {
"navigationStyle": "custom"
}
},
{
"path": "time/choiceDate" //时间选择
}
]
},
{
"root": "pages/share-team",
"pages": [{
"path": "share-team"
}, {
"path": "share-detail",
"style": {
"navigationStyle": "custom"
}
}]
},
{
"root": "pages/share-order",
"pages": [{
"path": "share-order"
}]
},
{
"root": "pages/share-qrcode",
"pages": [{
"path": "share-qrcode"
}, {
"path": "share-select-school"
}]
},
{
"root": "pages/share-money",
"pages": [{
"path": "share-money"
}]
},
{
"root": "pages/coupon",
"pages": [{
"path": "list/list"
},
{
"path": "details/details"
},
{
"path": "index/index"
},
{
"path": "cards/list" //储蓄卡列表
},
{
"path": "cards/carddetailed" //卡片明细
}, {
"path": "cards/cardsreceive", //储蓄卡的领取
"style": {
"navigationStyle": "custom"
}
},
{
"path": "cards/purchase", //购买储蓄卡
"style": {
"navigationStyle": "custom"
}
}
]
},
{
"root": "pages/order-submit",
"pages": [{
......@@ -339,45 +339,45 @@
}
]
},
// {
// "root": "pages/microShop",
// "pages": [{
// "path": "index/index",
// "style": {
// "navigationStyle": "custom"
// }
// },
// {
// "path": "myClients/myClients"
// },
// {
// "path": "wdWithdrawal"
// },
// {
// "path": "wdOrder"
// },
// {
// "path": "wdCase"
// },
// {
// "path": "shopSettings"
// },
// {
// "path": "storeManagement/storeManagement"
// },
// {
// "path": "storeManagement/goodsEdit"
// },
// {
// "path": "storeManagement/addGoods"
// },
// {
// "path": "storeManagement/index"
// }
{
"root": "pages/microShop",
"pages": [{
"path": "index/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "myClients/myClients"
},
{
"path": "wdWithdrawal"
},
{
"path": "wdOrder"
},
{
"path": "wdCase"
},
{
"path": "shopSettings"
},
{
"path": "storeManagement/storeManagement"
},
{
"path": "storeManagement/goodsEdit"
},
{
"path": "storeManagement/addGoods"
},
{
"path": "storeManagement/index"
}
// ]
]
// },
},
//司导模块
// {
// "root": "pages/guidecar",
......@@ -417,8 +417,7 @@
"pages": [{
"path": "index"
}]
}
// ,
},
//教育列表
// {
// "root": "pages/school",
......@@ -502,57 +501,58 @@
// }]
// },
//线下服务
// {
// "root": "pages/reserve",
// "pages": [{
// "path": "storeList"
// }, {
// "path": "storeDetails",
// "style": {
// "navigationStyle": "custom"
// }
// }, {
// "path": "personalList"
// }, {
// "path": "subscribe"
// }, {
// "path": "personal/couponDetail"
// }, {
// "path": "designerDetail"
// }, {
// "path": "goodsDetails"
// }, {
// "path": "personal/orderlist"
// }, {
// "path": "personal/orderDetails",
// "style": {
// "navigationStyle": "custom"
// }
// }, {
// "path": "personal/cardList"
// }, {
// "path": "personal/receivecard"
// }, {
// "path": "personal/order-commit"
// }, {
// "path": "personal/order-commit-details"
// }, {
// "path": "commentList"
// }, {
// "path": "share_qrcode"
// }, {
// "path": "offline-success",
// "style": {
// "navigationStyle": "custom"
// }
// }, {
// "path": "draw"
// }, {
// "path": "personal/myVipList"
// }, {
// "path": "personal/vipDetail"
// }]
// },
{
"root": "pages/reserve",
"pages": [{
"path": "storeList"
}, {
"path": "storeDetails",
"style": {
"navigationStyle": "custom"
}
}, {
"path": "personalList"
}, {
"path": "subscribe"
}, {
"path": "personal/couponDetail"
}, {
"path": "designerDetail"
}, {
"path": "goodsDetails"
}, {
"path": "personal/orderlist"
}, {
"path": "personal/orderDetails",
"style": {
"navigationStyle": "custom"
}
}, {
"path": "personal/cardList"
}, {
"path": "personal/receivecard"
}, {
"path": "personal/order-commit"
}, {
"path": "personal/order-commit-details"
}, {
"path": "commentList"
}, {
"path": "share_qrcode"
}, {
"path": "offline-success",
"style": {
"navigationStyle": "custom"
}
}, {
"path": "draw"
}, {
"path": "personal/myVipList"
}, {
"path": "personal/vipDetail"
}]
}
// ,
//朋友圈
// {
// "root": "pages/friendcircle",
......@@ -691,197 +691,197 @@
// ]
// },
//韩国馆项目
,{
"root": "pages/kotra",
"pages": [{
"path": "contanctus"
}, {
"path": "contanctDetail"
}, {
"path": "compInformation"
}, {
"path": "activeInner"
}, {
"path": "news" //最新动向
}, {
"path": "fat" //fat资讯
}, {
"path": "procurementList" //采购申请
}, {
"path": "investmentList" //投资申请
}, {
"path": "zixunList" //咨询信息
}, {
"path": "activeInnerDetail" //活动详情
}, {
"path": "newsInDetail" //新闻详情
}, {
"path": "procurementDetail" //采购查看详情
}, {
"path": "investmentDetail" //投资详情
}, {
"path": "activityList" //我的活动
}, {
"path": "zixunDetail" //咨询详情
}, {
"path": "typeList" //类型
}, {
"path": "companyInfo" //企业信息
}, {
"path": "activitysignUp" //活动报名 相亲模式
},
{
"path": "signList" //活动报名 相亲模式
},
{
"path": "baomingorder" //报名订单
}, {
"path": "brand/list" ,//品牌列表
"style": {
"navigationStyle": "custom"
},
"globalStyle": {
"navigationStyle": "custom"
}
}, {
"path": "brand/detail" //品牌详情
// ,{
// "root": "pages/kotra",
// "pages": [{
// "path": "contanctus"
// }, {
// "path": "contanctDetail"
// }, {
// "path": "compInformation"
// }, {
// "path": "activeInner"
// }, {
// "path": "news" //最新动向
// }, {
// "path": "fat" //fat资讯
// }, {
// "path": "procurementList" //采购申请
// }, {
// "path": "investmentList" //投资申请
// }, {
// "path": "zixunList" //咨询信息
// }, {
// "path": "activeInnerDetail" //活动详情
// }, {
// "path": "newsInDetail" //新闻详情
// }, {
// "path": "procurementDetail" //采购查看详情
// }, {
// "path": "investmentDetail" //投资详情
// }, {
// "path": "activityList" //我的活动
// }, {
// "path": "zixunDetail" //咨询详情
// }, {
// "path": "typeList" //类型
// }, {
// "path": "companyInfo" //企业信息
// }, {
// "path": "activitysignUp" //活动报名 相亲模式
// },
// {
// "path": "signList" //活动报名 相亲模式
// },
// {
// "path": "baomingorder" //报名订单
// }, {
// "path": "brand/list" ,//品牌列表
// "style": {
// "navigationStyle": "custom"
// },
// "globalStyle": {
// "navigationStyle": "custom"
// }
// }, {
// "path": "brand/detail" //品牌详情
// // "enablePullDownRefresh": true,
// // "style": {
// // "navigationStyle": "custom"
// // }
// },
// {
// "path": "activeList" //活动列表
// }, {
// "path": "activeSignUp" //活动报名
// },
// {
// "path": "signListEdit" //活动报名人员修改
// },
// {
// "path": "brand/detail_new" ,//品牌详情-新版
// "enablePullDownRefresh": false
// },{
// "path": "brand/detail_brand" ,//品牌详情-新版
// "enablePullDownRefresh": false
// },{
// "path": "brand/detail_company" ,//品牌详情-新版
// "enablePullDownRefresh": false
// },{
// "path": "carrier/detail_carrier", //新载体详情
// "enablePullDownRefresh": true,
// "style": {
// "navigationStyle": "custom"
// }
},
{
"path": "activeList" //活动列表
// },{
// "path": "carrier/detail_building", //楼宇信息
// "enablePullDownRefresh": true,
// "style": {
// "navigationStyle": "custom"
// }
// }, {
// "path": "carrier/detail", //品牌列表
// "enablePullDownRefresh": true,
// "style": {
// "navigationStyle": "custom"
// }
// }, {
// "path": "carrier/list", //载体列表
// "style": {
// "navigationStyle": "custom"
// },
// "globalStyle": {
// "navigationStyle": "custom"
// }
// }, {
// "path": "identification" //身份识别
// }, {
// "path": "firstShop/firstShop"
// }, {
// "path": "firstShop/list"
// }, {
// "path": "wish/list" //心愿列表
// }, {
// "path": "wish/detail" //心愿详情
// }, {
// "path": "wish/myWishPlan" //我的心愿计划
// }, {
// "path": "wish/richText" //心愿计划富文本
// }, {
// "path": "carrierInformation" //载体信息编辑页面
// }, {
// "path": "brandSearch" //品牌列表的搜索
// }, {
// "path": "enterpriseCertificationList" //企业认证列表
// }, {
// "path": "enterpriseCertificationdetails" //企业认证详情
// }, {
// "path": "billboard/billboardList", //榜单列表
// "style": {
// "navigationStyle": "custom"
// }
// }, {
// "path": "billboard/billboarddetails" //榜单详情
// }, {
// "path": "billboard/listsignUp" //榜单报名
// }, {
// "path": "billboard/mybillbordList", //我的榜单报名列表
// "style": {
// "navigationStyle": "custom"
// }
// }, {
// "path": "signSuccse" //报名成功页面
// },{
// "path": "BrandEnterSetIn/enterIndex" //载体首页
// }
// ]
// }
,{
"root": "pages/MallMange", //商城管理分包
"pages": [{
"path": "index"
}, {
"path": "activeSignUp" //活动报名
},
{
"path": "signListEdit" //活动报名人员修改
},
{
"path": "brand/detail_new" ,//品牌详情-新版
"enablePullDownRefresh": false
},{
"path": "brand/detail_brand" ,//品牌详情-新版
"enablePullDownRefresh": false
},{
"path": "brand/detail_company" ,//品牌详情-新版
"enablePullDownRefresh": false
},{
"path": "carrier/detail_carrier", //新载体详情
"enablePullDownRefresh": true,
"style": {
"navigationStyle": "custom"
}
},{
"path": "carrier/detail_building", //楼宇信息
"enablePullDownRefresh": true,
"style": {
"navigationStyle": "custom"
}
"path": "order"
}, {
"path": "carrier/detail", //品牌列表
"enablePullDownRefresh": true,
"style": {
"navigationStyle": "custom"
}
"path": "goods"
}, {
"path": "carrier/list", //载体列表
"style": {
"navigationStyle": "custom"
},
"globalStyle": {
"navigationStyle": "custom"
}
"path": "set"
}, {
"path": "identification" //身份识别
"path": "timeQuantum"
}, {
"path": "firstShop/firstShop"
"path": "userManage"
}, {
"path": "firstShop/list"
"path": "modifyAddress" //修改地址
}, {
"path": "wish/list" //心愿列表
"path": "returnModifyAddress" //修改退货地址
}, {
"path": "wish/detail" //心愿详情
"path": "address" //退货地址列表
}, {
"path": "wish/myWishPlan" //我的心愿计划
"path": "sendGoods" //发货
}, {
"path": "wish/richText" //心愿计划富文本
"path": "sendGoodsSaleAfter" //售后发货
}, {
"path": "carrierInformation" //载体信息编辑页面
"path": "commentsManage" //评论管理
}, {
"path": "brandSearch" //品牌列表的搜索
"path": "tixianApply" //提现申请
}, {
"path": "enterpriseCertificationList" //企业认证列表
"path": "orderMessage" //订单消息
}, {
"path": "enterpriseCertificationdetails" //企业认证详情
"path": "orderSearch" //订单搜索页
}, {
"path": "billboard/billboardList", //榜单列表
"path": "orderDetail", //订单详情
"style": {
"navigationStyle": "custom"
}
}, {
"path": "billboard/billboarddetails" //榜单详情
}, {
"path": "billboard/listsignUp" //榜单报名
}, {
"path": "billboard/mybillbordList", //我的榜单报名列表
"path": "afterOrderDetail", //售后订单详情
"style": {
"navigationStyle": "custom"
}
}, {
"path": "signSuccse" //报名成功页面
},{
"path": "BrandEnterSetIn/enterIndex" //载体首页
}
]
}]
}
// {
// "root": "pages/MallMange", //商城管理分包
// "pages": [{
// "path": "index"
// }, {
// "path": "order"
// }, {
// "path": "goods"
// }, {
// "path": "set"
// }, {
// "path": "timeQuantum"
// }, {
// "path": "userManage"
// }, {
// "path": "modifyAddress" //修改地址
// }, {
// "path": "returnModifyAddress" //修改退货地址
// }, {
// "path": "address" //退货地址列表
// }, {
// "path": "sendGoods" //发货
// }, {
// "path": "sendGoodsSaleAfter" //售后发货
// }, {
// "path": "commentsManage" //评论管理
// }, {
// "path": "tixianApply" //提现申请
// }, {
// "path": "orderMessage" //订单消息
// }, {
// "path": "orderSearch" //订单搜索页
// }, {
// "path": "orderDetail", //订单详情
// "style": {
// "navigationStyle": "custom"
// }
// }, {
// "path": "afterOrderDetail", //售后订单详情
// "style": {
// "navigationStyle": "custom"
// }
// }]
// },
// 咖啡
//, 咖啡
// {
// "root": "pages/coffee",
// "pages": [
......
pages/cart/cart.vue
View file @ 0f0ff7c6
......@@ -9,13 +9,12 @@
">
<Text class="grid-text" v-if='IsEducation!=1'>商品库存有限，请尽快下单哦</Text>
<Text class="grid-text"
v-if='IsEducation==1'>共{{list[0].GoodsList.length?list[0].GoodsList.length:'0'}}个课程</Text>
<Text @click="edit" v-if="editType == false && list[0].GoodsList.length>0" class="grid-text_r">编辑</Text>
v-if='IsEducation==1'>共{{list[0]&&list[0].GoodsList&&list[0].GoodsList.length?list[0].GoodsList.length:'0'}}个课程</Text>
<Text @click="edit" v-if="editType == false && list[0]&&list[0].GoodsList&&list[0].GoodsList.length>0" class="grid-text_r">编辑</Text>
<Text @click="edit" v-if="editType == true" class="grid-text_r">完成</Text>
</view>
<view style="width: 100%; height: 30rpx; background: #f7f7f7; margin: 20rpx 0;"></view>
<u-empty v-if="emptyshow == true" text="购物车还是空的哦" mode="car"></u-empty>
<view v-if="list.length > 0"
style="height: calc(100vh - 60px-30px-35px-20px);width: calc(100vw);overflow: hidden;padding-top: 10px;">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }">
......@@ -77,7 +76,7 @@
<view class="The-title">
{{ item.GoodsName}}
</view>
<view v-if="item.EduData.ClassCondition.length>0" class="limit" @touchstart="mouseover()" @touchend="mouseLeave()">
<view v-if="item.EduData&&item.EduData.ClassCondition&&item.EduData.ClassCondition.length>0" class="limit" @touchstart="mouseover()" @touchend="mouseLeave()">
<u-icon name="lock" size="44" :color="mc" />
<view class="limit-box" v-show="limitShow">
此课程有报名限制，请点击详情查看
......@@ -113,7 +112,7 @@
<!-- <Text v-if='u.TenantId==27&&item.EduData.ClassTime' style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;">
上课时间:{{item.EduData.ClassTime}}
</Text> -->
<view v-if="item.EduData.ClassTimeList.length>0&&u.TenantId==27"
<view v-if="item.EduData&&item.EduData.ClassTimeList&&item.EduData.ClassTimeList.length>0&&u.TenantId==27"
style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;">
<view v-if="!item.show">
<view style='display: flex;
......
pages/index/index.vue
View file @ 0f0ff7c6
......@@ -112,7 +112,7 @@
<view class="triangle-up" :style="{ top: pagePaddingBottom }"></view>
</view>
<coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon>
<template v-show="setting&&setting.is_show_auth==1">
<template v-if="setting&&setting.is_show_auth==1">
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</template>
<official-account></official-account>
......@@ -260,6 +260,9 @@
let c = this.$uiConfig.is_bang ? 78 : 50;
this.boxpaddingbottom = c;
this.contentHeight = this.$utils.calcContentHeight(c);
if (options && options.jzTravelOpenId) {
uni.setStorageSync("jzTravelOpenId", options.jzTravelOpenId);
}
if (options && options.page_id) {
this.pageId = options.page_id;
let queryString = "";
......@@ -440,6 +443,7 @@
} else {
that.sharejump(); //4-9新加
this.handleChengShuang();
this.SetMemberBindCustomer()
}
// #endif
......@@ -609,6 +613,27 @@
}
},
methods: {
SetMemberBindCustomer(){
let that = this;
that.request2({
url: "/api/MemberUser/SetMemberBindCustomer",
data: {
Id: that.u.UserId,
CustomerOpenId: uni.getStorageSync('jzTravelOpenId')
},
},
(res) => {
if (res.resultCode == 1) {
uni.removeStorageSync('jzTravelOpenId');
}
},(err) => {
// uni.showToast({
// title: err.message,
// icon: "none",
// });
}
);
},
getunilogin(res) {
let that = this;
//静默登录操作
......
pages/order-submit/order-submit.vue
View file @ 0f0ff7c6
......@@ -222,7 +222,17 @@
<text class="bold">{{ ds.total_price }}</text>
</view>
<view class="right">
<u-button :disabled="!address_enable" size="80" :ripple="true" shape="circle" @click="ds.promptNoSuperiorFY== true ? submitModel():submitOrderHandler()"
<u-button v-if="ds.promptNoSuperiorFY== true" :disabled="!address_enable" size="80" :ripple="true" shape="circle" @click="submitModel()"
:custom-style="{
backgroundColor: mc,
height: '80rpx',
color: '#FFF',
fontSize: '14px'
}">
<u-loading mode="circle" style="margin-right: 5px;" v-if="submitOrder"></u-loading>
{{btntext}}
</u-button>
<u-button v-else :disabled="!address_enable" size="80" :ripple="true" shape="circle" @click="submitOrderHandler()"
:custom-style="{
backgroundColor: mc,
height: '80rpx',
......@@ -554,7 +564,7 @@
that.payInfo.total_price = that.ds.total_price;
}
if (that.formdata.Use_Deposit_Id != 0 && that.ds.total_price == 0) { //如果使用了储蓄卡 就直接支付成功 跳入支付结果
if ((that.formdata.Use_Deposit_Id != 0 || that.formdata.use_integral != 0) && that.ds.total_price == 0) { //如果使用了储蓄卡 就直接支付成功 跳入支付结果
uni.reLaunch({
url: '/pages/order-submit/pay-success?payInfo=' + JSON.stringify(that.payInfo)
})
......
pages/order/order-detail.vue
View file @ 0f0ff7c6
......@@ -162,6 +162,10 @@
<view class="label">佣金抵扣</view>
<view class="content right">-￥{{ orders.DeductionCommission }}</view>
</view>
<view class="field" v-if="orders.IntegralMoney>0">
<view class="label">积分抵扣</view>
<view class="content right">-￥{{ orders.IntegralMoney }}</view>
</view>
<view style="width: 100%;height: 1px;background: #f5f5f5;margin: 5px 0;"></view>
<view class="field">
<view class="label">&nbsp;</view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment