fix: 修复订单提交逻辑并移除未使用的Android权限
- 修复订单提交组件中支付方式选择逻辑,防止payList为空时出错 - 重构地址校验逻辑,使用isShowAddress统一控制 - 移除未使用的Android定位和录音权限,改为excludePermissions配置 - 修正首页太湖云医区块的缩进格式 - 更新应用版本号至1.0.50
This commit is contained in:
@@ -13,8 +13,8 @@
|
|||||||
"src" : "图片路径"
|
"src" : "图片路径"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"versionName" : "1.0.49",
|
"versionName" : "1.0.50",
|
||||||
"versionCode" : 1049,
|
"versionCode" : 1050,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"nvueCompiler" : "weex",
|
"nvueCompiler" : "weex",
|
||||||
"compatible" : {
|
"compatible" : {
|
||||||
@@ -59,8 +59,6 @@
|
|||||||
"permissions" : [
|
"permissions" : [
|
||||||
"<uses-feature android:name=\"android.hardware.camera\"/>",
|
"<uses-feature android:name=\"android.hardware.camera\"/>",
|
||||||
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
|
"<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_NETWORK_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
|
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
|
"<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.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
|
"<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.REQUEST_INSTALL_PACKAGES\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
|
"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
||||||
@@ -86,7 +83,11 @@
|
|||||||
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
|
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
|
||||||
"minSdkVersion" : 21,
|
"minSdkVersion" : 21,
|
||||||
"targetSdkVersion" : 30,
|
"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" : {
|
"sdkConfigs" : {
|
||||||
"ad" : {},
|
"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) {
|
if (this.actualPayment == 0) {
|
||||||
var that = this;
|
var that = this;
|
||||||
this.payList.forEach((e, i) => {
|
this.payList.forEach((e, i) => {
|
||||||
@@ -780,8 +781,7 @@ export default {
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
this.selectPayIndex = 1;
|
this.selectPayIndex = 1;
|
||||||
// 如果实际支付金额为0,设置支付方式为默认货币
|
this.payType = 1;
|
||||||
this.payType = this.actualPayment ? 1 : 4
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -1397,11 +1397,9 @@ export default {
|
|||||||
come: this.come, //订单来源,0疯子读书1国学众妙之门2医学吴门医述
|
come: this.come, //订单来源,0疯子读书1国学众妙之门2医学吴门医述
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
if (this.options.goods[0].goodsType != "05") {
|
if (this.isShowAddress && !this.addressData.id) {
|
||||||
if (!this.addressData.id) {
|
this.$commonJS.showToast("请选择收货地址");
|
||||||
this.$commonJS.showToast("请选择收货地址");
|
return false;
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
data = {
|
data = {
|
||||||
@@ -1434,8 +1432,7 @@ export default {
|
|||||||
};
|
};
|
||||||
}), //订单列表商品
|
}), //订单列表商品
|
||||||
orderType: "order", //订单类型
|
orderType: "order", //订单类型
|
||||||
addressId:
|
addressId: this.isShowAddress ? this.addressData.id : 0, // 地址ID
|
||||||
this.options.goods[0].goodsType != "05" ? this.addressData.id : 0, // 地址ID
|
|
||||||
appName: this.appName,
|
appName: this.appName,
|
||||||
come: this.come,
|
come: this.come,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -14,14 +14,14 @@
|
|||||||
<text>吴门医述</text>
|
<text>吴门医述</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="everhealth item flexbox" @click="appjumpfun('taihu')" v-if="isShowTaihu">
|
<view class="everhealth item flexbox" @click="appjumpfun('taihu')" v-if="isShowTaihu">
|
||||||
<view class="img">
|
<view class="img">
|
||||||
<image src="@/static/icon/logo_taihu.png"></image>
|
<image src="@/static/icon/logo_taihu.png"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="text">
|
<view class="text">
|
||||||
<text>太湖云医</text>
|
<text>太湖云医</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view
|
<view
|
||||||
class="zmzm item flexbox"
|
class="zmzm item flexbox"
|
||||||
|
|||||||
Reference in New Issue
Block a user