diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue
index 908f309..6f0a610 100644
--- a/pages/login_package/login/login.vue
+++ b/pages/login_package/login/login.vue
@@ -103,9 +103,9 @@
bgColor="#f1f6ff00"
>
微信登录
-
-
-
+
+
+
{
- uni.showToast({
- title: '调用异步方法 ' + ret,
- icon: "none"
- })
- console.log(ret);
- });
+ methods: {
+
+ aa(){
+ const nativiPlugin = uni.requireNativePlugin('WITTestUniPlugin');
+ console.log("隐藏原生tabbar",nativiPlugin)
+ nativiPlugin.testAsyncFunc({},
+ (ret) => {
+ uni.showToast({
+ title: '调用异步方法 ' + ret,
+ icon: "none"
+ })
+ console.log(ret);
+ });
},
jumpHome() {
// const sysPlatform = getCurrentSysPlatform();
@@ -266,19 +266,19 @@ export default {
setStorageFun(USER_DATA, userInfo);
// 当前登录得时间戳
let currentTimeStamp = new Date().getTime();
- setStorageFun(USER_LOGIN_TIME, currentTimeStamp);
-
- const res = uni.getSystemInfoSync();
- uni.setStorageSync('platform', res.platform);
- // #ifdef APP-PLUS
- // 获取应用版本信息
- plus.runtime.getProperty(plus.runtime.appid, function(inf) {
- console.log("版本信息",inf.versionCode)
- uni.setStorageSync('version-1', inf.version); // 大版本号
- uni.setStorageSync('versionCode', inf.versionCode); // 小版本号
- });
- let uuid = plus.device.uuid;
- // #endif
+ setStorageFun(USER_LOGIN_TIME, currentTimeStamp);
+
+ const res = uni.getSystemInfoSync();
+ uni.setStorageSync('platform', res.platform);
+ // #ifdef APP-PLUS
+ // 获取应用版本信息
+ plus.runtime.getProperty(plus.runtime.appid, function(inf) {
+ console.log("版本信息",inf.versionCode)
+ uni.setStorageSync('version-1', inf.version); // 大版本号
+ uni.setStorageSync('versionCode', inf.versionCode); // 小版本号
+ });
+ let uuid = plus.device.uuid;
+ // #endif
this.$refs.uToastRef.show({
type: "success",
diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue
index 9b3f6d0..ad6253c 100644
--- a/pages/mine_package/mine_order/mine_order.vue
+++ b/pages/mine_package/mine_order/mine_order.vue
@@ -475,25 +475,28 @@ export default {
// 删除
deleteOrder(item) {
- console.log("删除", item);
+ console.log("删除", item, this.form.type);
this.deleteShow = true;
this.deleteInfo = item;
},
async againDeleteOrder() {
let params;
- if (this.deleteInfo.status === 4) {
+ if (this.form.type === 4 && (this.deleteInfo.status === 4 || this.deleteInfo.status === 5 || this.deleteInfo.status === 6 || this.deleteInfo.status === 7)) {
params = {
orderId: this.deleteInfo.id,
type: 1
}
}
- if (this.deleteInfo.status === 7) {
+ if (this.form.type === 5 && this.deleteInfo.status === 7) {
params = {
orderId: this.deleteInfo.afterId,
type: 2
}
}
console.log("删除-1", params);
+ if(!params.orderId){
+ return;
+ }
const res = await deleteOrderQuery(params);
if (res.bizcode == 100) {
this.$refs.uToastRef.show({