Skip to content

A
aimeiyue-xcx-user
Commit 8b452bee by xnn
Options

修复已知问题

parent 00220656
Showing with 78 additions and 10 deletions
amy/pageSub-pc/pages/myOrderlist/myOrderlist.vue
......@@ -29,7 +29,7 @@
<span>x{{jtem.goods_number}}</span>
</view>
<view class="orderPrice">
<span>¥</span>{{jtem.goods_price}}
<span>¥</span>{{item.order_amount}}
</view>
</view>
</view>
......
amy/pageSub-pc/pages/orderDetail/orderDetail.vue
......@@ -70,7 +70,7 @@
</view>
</view>
<view class="orderBtnList">
<view class="orderBtn" @click="payMthods(orderInfo.order_id)" v-show="orderInfo.order_status == 0">
<view class="orderBtn" @click="payMthods(orderInfo.id)" v-show="orderInfo.order_status == 0">
去支付
</view>
<view class="orderBtn" @click="goCode(orderInfo.verification_code)"
......
amy/pageSub-product/pages/confirmOrder/confirmOrder.vue
......@@ -210,7 +210,36 @@
return base64Url || img
},
changePayType(type) {
this.payType = type;
let _this = this;
if (type == 3 && this.userInfo.balance > this.allprice) {
uni.showToast({
icon: 'none',
title: '该笔订单不支持混合支付'
})
this.payType = 2;
this.allprice = 0;
return
} else if (type == 2 && this.userInfo.balance < this.allprice) {
uni.showToast({
icon: 'none',
title: '积分不足'
})
return
} else {
this.allprice = 0;
for (let i in this.OrderInfo) {
let addNum = _this.$utils.amend(_this.OrderInfo[i].goods_price, _this.OrderInfo[i].num,
"*");
_this.allprice = _this.$utils.amend(_this.allprice, addNum, "+")
}
if (type == 3) {
this.allprice = this.$utils.amend(this.allprice, this.userInfo.balance, "-")
}
if (type == 2) {
this.allprice = 0;
}
this.payType = type;
}
},
changegetGoodway() {
if (this.isbuycode) {
......
amy/pages/personalCenter/personalCenter.vue
......@@ -106,12 +106,12 @@
"text": "我的收藏",
"name": "myCollection"
},
{
"pagePath": "/pageSub-pc/pages/mybankList/mybankList",
"iconName": "http://amy.yyinhong.cn/uploads/wximg/bankicon.png",
"text": "我的银行卡",
"name": "mybankList"
},
// {
// "pagePath": "/pageSub-pc/pages/mybankList/mybankList",
// "iconName": "http://amy.yyinhong.cn/uploads/wximg/bankicon.png",
// "text": "我的银行卡",
// "name": "mybankList"
// },
{
"pagePath": "/pageSub-pc/pages/platformService/platformService",
"iconName": "http://amy.yyinhong.cn/uploads/wximg/pc_kf.png",
......
amy/pages/shoppingCart/shoppingCart.vue
......@@ -237,7 +237,7 @@
}
.productImg {
background-color: #f3d4d7;
// background-color: #f3d4d7;
width: 180rpx;
height: 180rpx;
margin-right: 30rpx;
......
amy/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
amy/unpackage/dist/dev/mp-weixin/common/runtime.js
......@@ -104,7 +104,46 @@
/******/ var promises = [];
/******/
/******/
/******/ // mini-css-extract-plugin CSS loading
/******/ var cssChunks = {"components/my-locationback/my-locationback":1,"node-modules/uview-ui/components/u-cell-group/u-cell-group":1,"node-modules/uview-ui/components/u-cell/u-cell":1,"node-modules/uview-ui/components/u-list-item/u-list-item":1,"node-modules/uview-ui/components/u-list/u-list":1,"node-modules/uview-ui/components/u-sticky/u-sticky":1,"node-modules/uview-ui/components/u-swiper/u-swiper":1,"components/my-tabbar/my-tabbar":1,"node-modules/uview-ui/components/u-toast/u-toast":1,"node-modules/uview-ui/components/u-button/u-button":1,"node-modules/uview-ui/components/u-icon/u-icon":1,"node-modules/uview-ui/components/u-number-box/u-number-box":1,"components/my-baseNar/my-baseNar":1,"node-modules/uview-ui/components/u-empty/u-empty":1,"node-modules/uview-ui/components/u-tabs/u-tabs":1,"node-modules/uview-ui/components/u-parse/u-parse":1,"components/my-backNar/my-backNar":1,"node-modules/uview-ui/components/u-gap/u-gap":1,"node-modules/uview-ui/components/u-upload/u-upload":1,"node-modules/uview-ui/components/u-rate/u-rate":1,"node-modules/uview-ui/components/u-popup/u-popup":1,"node-modules/uview-ui/components/u-picker/u-picker":1,"node-modules/uview-ui/components/u-line/u-line":1,"node-modules/uview-ui/components/u-loading-icon/u-loading-icon":1,"node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator":1,"node-modules/uview-ui/components/u-tabbar-item/u-tabbar-item":1,"node-modules/uview-ui/components/u-tabbar/u-tabbar":1,"node-modules/uview-ui/components/u-overlay/u-overlay":1,"node-modules/uview-ui/components/u-badge/u-badge":1,"node-modules/uview-ui/components/u-input/u-input":1,"node-modules/uview-ui/components/u-parse/node/node":1,"node-modules/uview-ui/components/u-textarea/u-textarea":1,"node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom":1,"node-modules/uview-ui/components/u-status-bar/u-status-bar":1,"node-modules/uview-ui/components/u-transition/u-transition":1,"node-modules/uview-ui/components/u-toolbar/u-toolbar":1};
/******/ if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
/******/ else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
/******/ promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
/******/ var href = "" + ({"components/my-locationback/my-locationback":"components/my-locationback/my-locationback","node-modules/uview-ui/components/u-cell-group/u-cell-group":"node-modules/uview-ui/components/u-cell-group/u-cell-group","node-modules/uview-ui/components/u-cell/u-cell":"node-modules/uview-ui/components/u-cell/u-cell","node-modules/uview-ui/components/u-list-item/u-list-item":"node-modules/uview-ui/components/u-list-item/u-list-item","node-modules/uview-ui/components/u-list/u-list":"node-modules/uview-ui/components/u-list/u-list","node-modules/uview-ui/components/u-sticky/u-sticky":"node-modules/uview-ui/components/u-sticky/u-sticky","node-modules/uview-ui/components/u-swiper/u-swiper":"node-modules/uview-ui/components/u-swiper/u-swiper","components/my-tabbar/my-tabbar":"components/my-tabbar/my-tabbar","node-modules/uview-ui/components/u-toast/u-toast":"node-modules/uview-ui/components/u-toast/u-toast","node-modules/uview-ui/components/u-button/u-button":"node-modules/uview-ui/components/u-button/u-button","node-modules/uview-ui/components/u-icon/u-icon":"node-modules/uview-ui/components/u-icon/u-icon","node-modules/uview-ui/components/u-number-box/u-number-box":"node-modules/uview-ui/components/u-number-box/u-number-box","components/my-baseNar/my-baseNar":"components/my-baseNar/my-baseNar","node-modules/uview-ui/components/u-empty/u-empty":"node-modules/uview-ui/components/u-empty/u-empty","node-modules/uview-ui/components/u-tabs/u-tabs":"node-modules/uview-ui/components/u-tabs/u-tabs","node-modules/uview-ui/components/u--input/u--input":"node-modules/uview-ui/components/u--input/u--input","node-modules/uview-ui/components/u-parse/u-parse":"node-modules/uview-ui/components/u-parse/u-parse","components/my-backNar/my-backNar":"components/my-backNar/my-backNar","node-modules/uview-ui/components/u-gap/u-gap":"node-modules/uview-ui/components/u-gap/u-gap","node-modules/uview-ui/components/u-upload/u-upload":"node-modules/uview-ui/components/u-upload/u-upload","node-modules/uview-ui/components/u--textarea/u--textarea":"node-modules/uview-ui/components/u--textarea/u--textarea","node-modules/uview-ui/components/u-rate/u-rate":"node-modules/uview-ui/components/u-rate/u-rate","node-modules/uview-ui/components/u-popup/u-popup":"node-modules/uview-ui/components/u-popup/u-popup","node-modules/uview-ui/components/u-picker/u-picker":"node-modules/uview-ui/components/u-picker/u-picker","node-modules/uview-ui/components/u-line/u-line":"node-modules/uview-ui/components/u-line/u-line","node-modules/uview-ui/components/u-loading-icon/u-loading-icon":"node-modules/uview-ui/components/u-loading-icon/u-loading-icon","node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator":"node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator","node-modules/uview-ui/components/u-tabbar-item/u-tabbar-item":"node-modules/uview-ui/components/u-tabbar-item/u-tabbar-item","node-modules/uview-ui/components/u-tabbar/u-tabbar":"node-modules/uview-ui/components/u-tabbar/u-tabbar","node-modules/uview-ui/components/u-overlay/u-overlay":"node-modules/uview-ui/components/u-overlay/u-overlay","node-modules/uview-ui/components/u-badge/u-badge":"node-modules/uview-ui/components/u-badge/u-badge","node-modules/uview-ui/components/u-input/u-input":"node-modules/uview-ui/components/u-input/u-input","node-modules/uview-ui/components/u-parse/node/node":"node-modules/uview-ui/components/u-parse/node/node","node-modules/uview-ui/components/u-textarea/u-textarea":"node-modules/uview-ui/components/u-textarea/u-textarea","node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom":"node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom","node-modules/uview-ui/components/u-status-bar/u-status-bar":"node-modules/uview-ui/components/u-status-bar/u-status-bar","node-modules/uview-ui/components/u-transition/u-transition":"node-modules/uview-ui/components/u-transition/u-transition","node-modules/uview-ui/components/u-toolbar/u-toolbar":"node-modules/uview-ui/components/u-toolbar/u-toolbar"}[chunkId]||chunkId) + ".wxss";
/******/ var fullhref = __webpack_require__.p + href;
/******/ var existingLinkTags = document.getElementsByTagName("link");
/******/ for(var i = 0; i < existingLinkTags.length; i++) {
/******/ var tag = existingLinkTags[i];
/******/ var dataHref = tag.getAttribute("data-href") || tag.getAttribute("href");
/******/ if(tag.rel === "stylesheet" && (dataHref === href || dataHref === fullhref)) return resolve();
/******/ }
/******/ var existingStyleTags = document.getElementsByTagName("style");
/******/ for(var i = 0; i < existingStyleTags.length; i++) {
/******/ var tag = existingStyleTags[i];
/******/ var dataHref = tag.getAttribute("data-href");
/******/ if(dataHref === href || dataHref === fullhref) return resolve();
/******/ }
/******/ var linkTag = document.createElement("link");
/******/ linkTag.rel = "stylesheet";
/******/ linkTag.type = "text/css";
/******/ linkTag.onload = resolve;
/******/ linkTag.onerror = function(event) {
/******/ var request = event && event.target && event.target.src || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
/******/ err.request = request;
/******/ delete installedCssChunks[chunkId]
/******/ linkTag.parentNode.removeChild(linkTag)
/******/ reject(err);
/******/ };
/******/ linkTag.href = fullhref;
/******/
/******/ var head = document.getElementsByTagName("head")[0];
/******/ head.appendChild(linkTag);
/******/ }).then(function() {
/******/ installedCssChunks[chunkId] = 0;
/******/ }));
/******/ }
/******/
/******/ // JSONP chunk loading for javascript
/******/
......
amy/unpackage/dist/dev/mp-weixin/common/vendor.js
This source diff could not be displayed because it is too large. You can view the blob instead.
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