fix: 修复订单提交逻辑并移除未使用的Android权限
- 修复订单提交组件中支付方式选择逻辑,防止payList为空时出错 - 重构地址校验逻辑,使用isShowAddress统一控制 - 移除未使用的Android定位和录音权限,改为excludePermissions配置 - 修正首页太湖云医区块的缩进格式 - 更新应用版本号至1.0.50
This commit is contained in:
@@ -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" : [
|
||||
"<uses-feature android:name=\"android.hardware.camera\"/>",
|
||||
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
|
||||
@@ -75,7 +73,6 @@
|
||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
|
||||
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
|
||||
"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
|
||||
"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
|
||||
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
||||
@@ -86,7 +83,11 @@
|
||||
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
|
||||
"minSdkVersion" : 21,
|
||||
"targetSdkVersion" : 30,
|
||||
"schemes" : "zmzm"
|
||||
"schemes" : "zmzm",
|
||||
"excludePermissions" : [
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>"
|
||||
]
|
||||
},
|
||||
"sdkConfigs" : {
|
||||
"ad" : {},
|
||||
|
||||
@@ -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,12 +1397,10 @@ export default {
|
||||
come: this.come, //订单来源,0疯子读书1国学众妙之门2医学吴门医述
|
||||
};
|
||||
} else {
|
||||
if (this.options.goods[0].goodsType != "05") {
|
||||
if (!this.addressData.id) {
|
||||
if (this.isShowAddress && !this.addressData.id) {
|
||||
this.$commonJS.showToast("请选择收货地址");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
data = {
|
||||
buyType: this.options.typeId, //0- 商品页直接下单 1- 购物车结算
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user