修改vip积分支付没有默认天医币的问题
This commit is contained in:
@@ -12,8 +12,8 @@
|
|||||||
"src" : "图片路径"
|
"src" : "图片路径"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"versionName" : "2.0.31",
|
"versionName" : "2.0.32",
|
||||||
"versionCode" : 2031,
|
"versionCode" : 2032,
|
||||||
"sassImplementationName" : "node-sass",
|
"sassImplementationName" : "node-sass",
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"nvueCompiler" : "uni-app",
|
"nvueCompiler" : "uni-app",
|
||||||
|
|||||||
@@ -557,7 +557,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.payType = this.payList[this.selectPayIndex].type;
|
this.payType = this.payList.length && this.payList[this.selectPayIndex].type;
|
||||||
if (this.actualPayment == 0) {
|
if (this.actualPayment == 0) {
|
||||||
var that = this;
|
var that = this;
|
||||||
this.payList.forEach((e, i) => {
|
this.payList.forEach((e, i) => {
|
||||||
@@ -725,7 +725,7 @@
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
async mounted() {
|
async created() {
|
||||||
this.curCouponId = undefined;
|
this.curCouponId = undefined;
|
||||||
var that = this;
|
var that = this;
|
||||||
await uni.$on("returnData", function (data) {
|
await uni.$on("returnData", function (data) {
|
||||||
@@ -1271,8 +1271,7 @@
|
|||||||
}
|
}
|
||||||
if (!this.isShowAddress) {
|
if (!this.isShowAddress) {
|
||||||
if (that.initData.user && that.initData.user.jf) {
|
if (that.initData.user && that.initData.user.jf) {
|
||||||
var totalMoney =
|
var totalMoney = that.totalPrice - that.districtAmount - that.vipPrice;
|
||||||
that.totalPrice - that.districtAmount - that.vipPrice;
|
|
||||||
if (this.initData.user.jf >= totalMoney) {
|
if (this.initData.user.jf >= totalMoney) {
|
||||||
const integerPart = Math.floor(totalMoney);
|
const integerPart = Math.floor(totalMoney);
|
||||||
|
|
||||||
@@ -1303,7 +1302,6 @@
|
|||||||
that.freightNum -
|
that.freightNum -
|
||||||
that.districtAmount -
|
that.districtAmount -
|
||||||
that.vipPrice;
|
that.vipPrice;
|
||||||
console.log(that.actualPayment)
|
|
||||||
} else {
|
} else {
|
||||||
that.actualPayment =
|
that.actualPayment =
|
||||||
that.totalPrice +
|
that.totalPrice +
|
||||||
|
|||||||
@@ -346,7 +346,7 @@ export default {
|
|||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.commonPage, .commonPageBox {
|
.commonPage, .commonPageBox {
|
||||||
height: calc(100vh - 50px);
|
height: calc(100vh - 90px);
|
||||||
}
|
}
|
||||||
.goodsvipLabel {
|
.goodsvipLabel {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|||||||
8
unpackage/dist/build/app-plus/app-service.js
vendored
8
unpackage/dist/build/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
6
unpackage/dist/build/app-plus/app-view.js
vendored
6
unpackage/dist/build/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/build/app-plus/manifest.json
vendored
2
unpackage/dist/build/app-plus/manifest.json
vendored
File diff suppressed because one or more lines are too long
82
unpackage/dist/dev/app-plus/app-service.js
vendored
82
unpackage/dist/dev/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/dev/app-plus/app-view.js
vendored
2
unpackage/dist/dev/app-plus/app-view.js
vendored
@@ -76729,7 +76729,7 @@ if(false) {}
|
|||||||
var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ./node_modules/css-loader/dist/runtime/api.js */ 13);
|
var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ./node_modules/css-loader/dist/runtime/api.js */ 13);
|
||||||
exports = ___CSS_LOADER_API_IMPORT___(false);
|
exports = ___CSS_LOADER_API_IMPORT___(false);
|
||||||
// Module
|
// Module
|
||||||
exports.push([module.i, "@charset \"UTF-8\";\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */\n/* 透明度 */\n/* 文章场景相关 */\n.commonPage[data-v-83bdc582], .commonPageBox[data-v-83bdc582] {\n height: calc(100vh - 50px);\n}\n.goodsvipLabel[data-v-83bdc582] {\n position: absolute;\n z-index: 10;\n top: 4px;\n left: 0px;\n margin-right: 10px;\n text-align: center;\n font-size: 18rpx;\n background-color: #f94f04;\n color: #fff;\n font-weight: bold;\n border-radius: 4px;\n width: 80rpx;\n padding: 2px 4px;\n box-sizing: border-box;\n}\n.goods_item_img[data-v-83bdc582] {\n width: 140rpx;\n height: 140rpx;\n float: left;\n background-color: #f5f5f5;\n border-radius: 10rpx;\n}\n", ""]);
|
exports.push([module.i, "@charset \"UTF-8\";\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */\n/* 透明度 */\n/* 文章场景相关 */\n.commonPage[data-v-83bdc582], .commonPageBox[data-v-83bdc582] {\n height: calc(100vh - 90px);\n}\n.goodsvipLabel[data-v-83bdc582] {\n position: absolute;\n z-index: 10;\n top: 4px;\n left: 0px;\n margin-right: 10px;\n text-align: center;\n font-size: 18rpx;\n background-color: #f94f04;\n color: #fff;\n font-weight: bold;\n border-radius: 4px;\n width: 80rpx;\n padding: 2px 4px;\n box-sizing: border-box;\n}\n.goods_item_img[data-v-83bdc582] {\n width: 140rpx;\n height: 140rpx;\n float: left;\n background-color: #f5f5f5;\n border-radius: 10rpx;\n}\n", ""]);
|
||||||
// Exports
|
// Exports
|
||||||
module.exports = exports;
|
module.exports = exports;
|
||||||
|
|
||||||
|
|||||||
2
unpackage/dist/dev/app-plus/manifest.json
vendored
2
unpackage/dist/dev/app-plus/manifest.json
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user