diff --git a/manifest.json b/manifest.json index 26bd278..6bc4f21 100644 --- a/manifest.json +++ b/manifest.json @@ -13,8 +13,8 @@ "src" : "图片路径" } ], - "versionName" : "1.0.49", - "versionCode" : 1049, + "versionName" : "1.0.50", + "versionCode" : 1050, "app-plus" : { "nvueCompiler" : "weex", "compatible" : { @@ -59,8 +59,6 @@ "permissions" : [ "", "", - "", - "", "", "", "", @@ -75,7 +73,6 @@ "", "", "", - "", "", "", "", @@ -86,7 +83,11 @@ "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], "minSdkVersion" : 21, "targetSdkVersion" : 30, - "schemes" : "zmzm" + "schemes" : "zmzm", + "excludePermissions" : [ + "", + "" + ] }, "sdkConfigs" : { "ad" : {}, diff --git a/pages/component/commonComponents/orderSubmit.vue b/pages/component/commonComponents/orderSubmit.vue index 31f8e98..74d52ea 100644 --- a/pages/component/commonComponents/orderSubmit.vue +++ b/pages/component/commonComponents/orderSubmit.vue @@ -558,7 +558,8 @@ export default { } } - this.payType = this.payList[this.selectPayIndex].type; + this.payType = + this.payList.length && this.payList[this.selectPayIndex].type; if (this.actualPayment == 0) { var that = this; this.payList.forEach((e, i) => { @@ -780,8 +781,7 @@ export default { }, ]; this.selectPayIndex = 1; - // 如果实际支付金额为0,设置支付方式为默认货币 - this.payType = this.actualPayment ? 1 : 4 + this.payType = 1; } }, computed: { @@ -1397,11 +1397,9 @@ export default { come: this.come, //订单来源,0疯子读书1国学众妙之门2医学吴门医述 }; } else { - if (this.options.goods[0].goodsType != "05") { - if (!this.addressData.id) { - this.$commonJS.showToast("请选择收货地址"); - return false; - } + if (this.isShowAddress && !this.addressData.id) { + this.$commonJS.showToast("请选择收货地址"); + return false; } data = { @@ -1434,8 +1432,7 @@ export default { }; }), //订单列表商品 orderType: "order", //订单类型 - addressId: - this.options.goods[0].goodsType != "05" ? this.addressData.id : 0, // 地址ID + addressId: this.isShowAddress ? this.addressData.id : 0, // 地址ID appName: this.appName, come: this.come, }; diff --git a/pages/homePage/index/index.vue b/pages/homePage/index/index.vue index 11a1acc..b7d7d40 100644 --- a/pages/homePage/index/index.vue +++ b/pages/homePage/index/index.vue @@ -14,14 +14,14 @@ 吴门医述 - - - - - - 太湖云医 - - + + + + + + 太湖云医 + +