Skip to content

梁建民 / wmsMin

Go to a project
Commit 7aacd3c4 by liangjianmin
Options

js

parent 3f0bd246
Inline Side-by-side
Showing with 45 additions and 45 deletions
pages/home/index.vue
......@@ -26,25 +26,22 @@
<zy-grid :grid-list="gridList" :show-tip="true" :col="3" @gridClickChange="gridClick"></zy-grid>
</template>
<template v-else>
<navigator class="box column verCenter" url="/pages/mine/login" hover-class="none">
<text class="iconfont icon-a-juxing1"></text>
<text class="text">快递回单上传</text>
</navigator>
<navigator class="box column verCenter" url="/pages/mine/login" hover-class="none">
<text class="iconfont icon-a-juxing1"></text>
<text class="text">司机回单上传</text>
</navigator>
<navigator class="box column verCenter" url="/pages/mine/login" hover-class="none">
<text class="iconfont icon-a-juxing1"></text>
<text class="text">自提回单上传</text>
</navigator>
<zy-grid :grid-list="gridList" :show-tip="true" :col="3" @gridClickChange="toUrl()"></zy-grid>
</template>
</view>
</view>
<view class="scan row rowCenter verCenter" @click="scanChange()">
<text class="iconfont icon-juxing2"></text>
<text class="tt">扫描</text>
</view>
<template v-if="is_login">
<view class="scan row rowCenter verCenter" @click="scanChange()">
<text class="iconfont icon-juxing2"></text>
<text class="tt">扫描</text>
</view>
</template>
<template v-else>
<navigator class="scan row rowCenter verCenter" url="/pages/mine/login" hover-class="none">
<text class="iconfont icon-juxing2"></text>
<text class="tt">扫描</text>
</navigator>
</template>
</view>
</template>
......@@ -139,6 +136,11 @@ export default {
}
});
},
toUrl() {
uni.navigateTo({
url: '/pages/mine/login'
});
},
gridClick(item, index) {
if (item.name == '快递回单上传') {
this.scanChange();
......
pages/mine/auth.vue
......@@ -6,7 +6,7 @@
<text class="iconfont icon-jinggao1"></text>
<text class="t1">微信授权登录</text>
</button>
<view class="copyright">©2021深圳市猎芯供应链有限公司 ALL RIGHTS RESERVED</view>
<view class="copyright">©2022深圳市猎芯供应链有限公司 ALL RIGHTS RESERVED</view>
</view>
</template>
......
pages/mine/authPhone.vue
......@@ -6,7 +6,7 @@
<text class="iconfont icon-jinggao1"></text>
<text class="t1">微信授权获取手机号</text>
</button>
<view class="copyright">©2021深圳市猎芯供应链有限公司 ALL RIGHTS RESERVED</view>
<view class="copyright">©2022深圳市猎芯供应链有限公司 ALL RIGHTS RESERVED</view>
</view>
</template>
......
pages/mine/login.vue
......@@ -13,7 +13,7 @@
</view>
<button class="btn row rowCenter verCenter" @click="submit()">登录</button>
</view>
<view class="copyright">©2021深圳市猎芯供应链有限公司 ALL RIGHTS RESERVED</view>
<view class="copyright">©2022深圳市猎芯供应链有限公司 ALL RIGHTS RESERVED</view>
</view>
</template>
......@@ -52,7 +52,7 @@ export default {
return false;
}
this.request(API.login, 'POST', { account: this.account, passwd: this.passwd }).then(res => {
this.request(API.login, 'POST', { account: this.account, passwd: this.passwd },true).then(res => {
if (res.err_code === 0) {
uni.setStorageSync('token', res.data.token);
uni.navigateBack({
......
pages/tag/print.vue
......@@ -59,12 +59,12 @@ export default {
}
};
},
created(){
this.getTraySelectOption();
created() {
this.getTraySelectOption();
},
methods: {
getTraySelectOption() {
this.request(API.getTraySelectOption, 'POST', { erp_order_sn: this.form.erp_order_sn_pre + this.form.erp_order_sn_number}, false).then(res => {
this.request(API.getTraySelectOption, 'POST', { erp_order_sn: this.form.erp_order_sn_pre + this.form.erp_order_sn_number }, false).then(res => {
if (res.err_code === 0) {
this.traySelectOption = res.data;
}
......@@ -76,8 +76,6 @@ export default {
this.form.tray_remark = this.traySelectOption[e.target.value].wstylt_id;
},
submit() {
this.openBluetoothAdapter();
return false;
if (!this.form.erp_order_sn_pre) {
uni.showToast({
icon: 'error',
......@@ -125,21 +123,9 @@ export default {
return false;
}
this.request(API.printLabel, 'POST', this.form).then(res => {
this.request(API.printLabel, 'POST', this.form,true).then(res => {
if (res.err_code === 0) {
uni.showModal({
title: '提示',
content: '提交成功，打印中，请查看标签打印机',
showCancel: false,
confirmText: '关闭',
success: function(res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
this.openBluetoothAdapter();
} else {
uni.showToast({
title: res.err_msg,
......@@ -218,6 +204,19 @@ export default {
uni.hideLoading();
that.characteristics = res.characteristics[0].uuid;
console.log('服务功能', res);
uni.showModal({
title: '提示',
content: '提交成功，打印中，请查看标签打印机',
showCancel: false,
confirmText: '关闭',
success: function(res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
},
fail: res => {
console.log('失败', res);
......@@ -230,13 +229,10 @@ export default {
this.index_erp_order_sn_pre = index;
if (index == 0) {
this.form.erp_order_sn_pre = 'A';
this.index = -1;
} else if (index == 1) {
this.form.erp_order_sn_pre = 'B';
this.index = 0;
} else if (index == 2) {
this.form.erp_order_sn_pre = 'D';
this.index = 0;
}
} else if (type == 'print_type') {
//打印类型
......
pages/tag/repairPrint.vue
......@@ -93,7 +93,7 @@ export default {
return false;
}
this.request(API.getPrintLabel, 'POST', { erp_order_sn: this.form.erp_order_sn_pre + this.form.erp_order_sn_number, label_sort: this.form.label_sort }).then(res => {
this.request(API.getPrintLabel, 'POST', { erp_order_sn: this.form.erp_order_sn_pre + this.form.erp_order_sn_number, label_sort: this.form.label_sort },true).then(res => {
if (res.err_code === 0) {
uni.showModal({
title: '提示',
......
util/util.js
......@@ -10,7 +10,7 @@ const request = (url = '', type = 'GET', param = {}, Loading) => {
//是否启动加载
if (Loading) {
uni.showLoading({
title: '加载中...'
mask: true
});
}
const header = {
......@@ -31,7 +31,9 @@ const request = (url = '', type = 'GET', param = {}, Loading) => {
let [error, res] = response;
resolve(res.data);
}).catch(error => {
uni.hideLoading();
if (Loading) {
uni.hideLoading();
}
let [err, res] = error;
reject(err);
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment