Skip to content

梁建民 / wmsMin

Go to a project
Commit b77c754f by liangjianmin
Options

js

parent 873ef707
Inline Side-by-side
Showing with 325 additions and 208 deletions
assets/css/font.css
...@@ -11,87 +11,19 @@ ...@@ -11,87 +11,19 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-Chevron1:before { .icon-juxing2:before {
content: "\e769"; content: "\e76f";
} }
.icon-Chevron:before { .icon-juxing1:before {
content: "\e768"; content: "\e76e";
}
.icon-a-juxing1:before {
content: "\e767";
} }
.icon-juxing:before { .icon-juxing:before {
content: "\e766"; content: "\e76b";
}
.icon-zhixian:before {
content: "\e765";
}
.icon-dingwei:before {
content: "\e764";
}
.icon-sanjiaoxing1:before {
content: "\e763";
}
.icon-jinggao3:before {
content: "\e762";
}
.icon-sanjiaoxing:before {
content: "\e761";
}
.icon-a-riqi12:before {
content: "\e75e";
}
.icon-riqi2:before {
content: "\e75f";
}
.icon-a-riqi2:before {
content: "\e760";
}
.icon-jinggao2:before {
content: "\e75d";
}
.icon-jinggao1:before {
content: "\e75c";
}
.icon-a-riqi11:before {
content: "\e75a";
}
.icon-riqi1:before {
content: "\e75b";
} }
.icon-a-jinggao3:before { .icon-a-juxing1:before {
content: "\e759"; content: "\e76d";
}
.icon-a-jinggao1:before {
content: "\e757";
}
.icon-a-riqi1:before {
content: "\e758";
}
.icon-riqi:before {
content: "\e755";
}
.icon-jinggao:before {
content: "\e756";
} }
assets/css/home/index.scss
.home{ .home-index {
.head {
padding-top: 12rpx;
height: 180rpx;
background: #ffffff;
border-bottom: 1px solid #e6edf0;
padding-left: 28rpx;
padding-right: 24rpx;
.box {
.icon-juxing {
font-size: 120rpx;
color: #197adb;
margin-right: 24rpx;
}
.t1 {
font-size: 36rpx;
color: #197adb;
font-weight: bold;
}
.t2 {
font-size: 24rpx;
color: #404547;
margin-top: 12rpx;
}
.t3 {
font-size: 22rpx;
color: #6e767a;
}
}
}
.fast-entry {
height: 233rpx;
background: #ffffff;
padding-left: 24rpx;
padding-top: 24rpx;
.tit {
font-size: 24rpx;
color: #1e2021;
font-weight: bold;
margin-bottom: 36rpx;
}
.bar {
.box {
position: relative;
flex: 0 0 33.3%;
height: 102rpx;
border-right: 1px solid #e6edf0;
&:last-child {
border-right: none;
}
.num {
position: absolute;
right: 32rpx;
top: 5rpx;
width: 42rpx;
height: 32rpx;
background: #bb3434;
border-radius: 16rpx;
font-size: 20rpx;
color: #ffffff;
}
.iconfont {
font-size: 64rpx;
color: #197adb;
}
.text {
margin-top: 8rpx;
font-size: 22rpx;
color: #404547;
}
}
}
}
.scan {
position: fixed;
bottom: 50rpx;
left: 0;
right: 0;
width: 301rpx;
height: 86rpx;
background: #197adb;
box-shadow: 0px 9rpx 10rpx 0px rgba(0, 0, 0, 0.11);
border-radius: 43rpx;
margin: 0 auto;
.iconfont {
font-size: 48rpx;
color: #ffffff;
margin-right: 28rpx;
}
.tt {
font-size: 32rpx;
color: #ffffff;
}
}
} }
assets/css/mine/index.scss
...@@ -7,30 +7,23 @@ ...@@ -7,30 +7,23 @@
background: #ffffff; background: #ffffff;
border-radius: 4rpx; border-radius: 4rpx;
.uni-img { .uni-img {
width: 101rpx; width: 100rpx;
height: 101rpx; height: 100rpx;
border-radius: 50%; border-radius: 50%;
} }
.text { .text {
margin-left: 38rpx; margin-left: 32rpx;
.mb16{ .mb16{
margin-bottom: 16rpx; margin-bottom: 16rpx;
} }
.t1 { .t1 {
font-size: 28rpx; font-size: 28rpx;
color: #1E2021; color: #1E2021;
line-height: 40rpx;
} }
.t2 { .t2 {
margin-top: 20rpx;
font-size: 22rpx; font-size: 22rpx;
color: #6e767a; color: #6E767A;
line-height: 30rpx;
}
.t3 {
font-size: 22rpx;
color: #404547;
line-height: 30rpx;
margin-left: 16rpx;
} }
} }
.iconfont{ .iconfont{
...@@ -45,22 +38,20 @@ ...@@ -45,22 +38,20 @@
} }
.not-logged-in { .not-logged-in {
margin: 0 24rpx; margin: 0 24rpx;
padding: 0 24rpx 59rpx 24rpx;
height: 184rpx; height: 184rpx;
background: #ffffff; background: #ffffff;
border-radius: 4rpx; border-radius: 4rpx;
align-items: flex-end; padding-left: 24rpx;
.uni-img { .uni-img {
width: 101rpx; width: 100rpx;
height: 101rpx; height: 100rpx;
border-radius: 50%; border-radius: 50%;
} }
.text { .text {
margin-left: 38rpx; margin-left: 32rpx;
.t1 { .t1 {
font-size: 28rpx; font-size: 28rpx;
color: #197adb; color: #197adb;
margin-bottom: 20rpx;
} }
.t2 { .t2 {
font-size: 22rpx; font-size: 22rpx;
......
assets/css/scan/confirm.scss 0 → 100644
.scan-confirm {
.form-box {
margin: 24rpx 24rpx 44rpx 24rpx;
.wrap {
padding: 24rpx 24rpx 0 24rpx;
background: #ffffff;
border-radius: 4px;
.tit {
margin-bottom: 24rpx;
.arrow {
width: 12rpx;
height: 12rpx;
background: #197adb;
border-radius: 50%;
}
.tt {
margin-left: 16rpx;
font-size: 32rpx;
color: #1e2021;
font-weight: bold;
}
}
.box {
height: 80rpx;
&.bor {
border-bottom: 1px solid #e6edf0;
}
.left-text {
font-size: 24rpx;
color: #6e767a;
}
.right-text {
font-size: 24rpx;
color: #404547;
}
}
.pic-list {
padding-bottom: 48rpx;
border-bottom: 1px solid #e6edf0;
flex-wrap: wrap;
.default {
width: 144rpx;
height: 144rpx;
background: url('http://img.ichunt.com/images/ichunt/minProgram/scm/f5f40f7d57b1203ef75ead5feb1e137d.png') no-repeat center;
background-size: cover;
}
.pp {
width: 144rpx;
height: 144rpx;
margin-right: 24rpx;
image {
width: 144rpx;
height: 144rpx;
}
&:nth-of-type(4n) {
margin-right: 0;
}
}
}
.remark {
padding-top: 24rpx;
height: 118rpx;
font-size: 24rpx;
&:-webkit-input-placeholder {
color: #6e767a;
}
}
}
}
.btn {
height: 88rpx;
background: #197adb;
border-radius: 4rpx;
font-size: 28rpx;
color: #ffffff;
margin: 0 24rpx;
}
}
pages.json
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"pages": [{ "pages": [{
"path": "pages/home/index", "path": "pages/home/index",
"style": { "style": {
"navigationBarTitleText": "首页", "navigationBarTitleText": "供应链面单系统",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, { }, {
...@@ -11,6 +11,11 @@ ...@@ -11,6 +11,11 @@
"navigationBarTitleText": "扫描" "navigationBarTitleText": "扫描"
} }
}, { }, {
"path": "pages/scan/confirm",
"style": {
"navigationBarTitleText": "签收提交确认"
}
}, {
"path": "pages/mine/index", "path": "pages/mine/index",
"style": { "style": {
"navigationBarTitleText": "我的" "navigationBarTitleText": "我的"
...@@ -33,7 +38,7 @@ ...@@ -33,7 +38,7 @@
}], }],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "猎芯供应链商务系统", "navigationBarTitleText": "供应链面单系统",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"backgroundColor": "#FFFFFF" "backgroundColor": "#FFFFFF"
}, },
...@@ -49,12 +54,6 @@ ...@@ -49,12 +54,6 @@
"text": "首页" "text": "首页"
}, },
{ {
"pagePath": "pages/scan/index",
"iconPath": "static/2.png",
"selectedIconPath": "static/2s.png",
"text": "扫描 "
},
{
"pagePath": "pages/mine/index", "pagePath": "pages/mine/index",
"iconPath": "static/3.png", "iconPath": "static/3.png",
"selectedIconPath": "static/3s.png", "selectedIconPath": "static/3s.png",
......
pages/home/index.vue
<template> <template>
<view class="home">首页</view> <view class="home-index">
<view class="head">
<!-- 未登录 -->
<view class="row verCenter box" v-if="is_login">
<view class="row verCenter">
<text class="iconfont icon-juxing"></text>
<text class="t1">未登录</text>
</view>
</view>
<!-- 已登录 -->
<view class="row bothSide verCenter box" v-else>
<view class="row verCenter">
<text class="iconfont icon-juxing"></text>
<view class="column">
<text class="t1">张同学</text>
<text class="t2">cwl@ichunt.com</text>
</view>
</view>
<text class="t3">仓储部门 -工号0005</text>
</view>
</view>
<view class="fast-entry">
<view class="tit">快捷操作入口</view>
<view class="row avarage bar">
<view class="box column verCenter">
<text class="iconfont icon-a-juxing1"></text>
<text class="text">快递回单上传</text>
<text class="num row rowCenter verCenter">12</text>
</view>
<view class="box column verCenter">
<text class="iconfont icon-a-juxing1"></text>
<text class="text">司机回单上传</text>
<text class="num row rowCenter verCenter">12</text>
</view>
<view class="box column verCenter">
<text class="iconfont icon-a-juxing1"></text>
<text class="text">自提回单上传</text>
<text class="num row rowCenter verCenter">12</text>
</view>
</view>
</view>
<view class="scan row rowCenter verCenter">
<text class="iconfont icon-juxing2"></text>
<text class="tt">扫描</text>
</view>
</view>
</template> </template>
<script> <script>
...@@ -7,17 +52,15 @@ import { API } from '@/util/api.js'; ...@@ -7,17 +52,15 @@ import { API } from '@/util/api.js';
export default { export default {
data() { data() {
return {}; return {
is_login: false
};
}, },
onShow() { onShow() {
this.list = [];
this.page = 1;
this.getData(); this.getData();
}, },
methods: { methods: {
getData() { getData() {}
this.request(API.OrderList, 'GET', { limit: this.limit }, this.loading).then(res => {});
}
} }
}; };
</script> </script>
......
pages/mine/index.vue
<template> <template>
<view class="mine-index"> <view class="mine-index">
<template v-if="!isLogin"> <template v-if="!isLogin">
<view class="not-logged-in row bothSide" @click="toUrl"> <view class="not-logged-in row verCenter" @click="toUrl">
<view class="row verCenter"> <view class="row verCenter">
<image class="uni-img" src="http://img.ichunt.com/images/ichunt/minProgram/scmMinProgram/9cea8db75c06e38dd737b302d7336068.png" mode="aspectFill"></image> <image class="uni-img" src="http://img.ichunt.com/images/ichunt/minProgram/scm/14ec21333cd69cc5269772811b46b7ac.png" mode="aspectFill"></image>
<view class="text column"> <view class="text column"><text class="t1">未登录</text></view>
<text class="t1">未登录</text>
<view>
<text class="t2">手机号:</text>
<text class="t3">未登录</text>
</view>
</view>
</view>
<view>
<text class="iconfont icon-jinggao1"></text>
<text class="tt">未绑定</text>
</view> </view>
</view> </view>
</template> </template>
<template v-else> <template v-else>
<view class="logged-in row bothSide verCenter"> <view class="logged-in row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
<image class="uni-img" :src="userData.head_pic || 'http://img.ichunt.com/images/ichunt/minProgram/scmMinProgram/9cea8db75c06e38dd737b302d7336068.png'" mode="aspectFill"></image> <image
class="uni-img"
:src="userData.head_pic || 'http://img.ichunt.com/images/ichunt/minProgram/scm/14ec21333cd69cc5269772811b46b7ac.png'"
mode="aspectFill"
></image>
<view class="text column"> <view class="text column">
<text class="t1">{{ userData.company_name }}</text> <text class="t1">{{ userData.company_name }}</text>
<view> <text class="t2">cwl@ichunt.com</text>
<text class="t2">手机号:</text>
<text class="t3">{{ userData.mobile }}</text>
</view>
<view>
<text class="t2">最近登录:</text>
<text class="t3">{{ userData.last_login_time }}</text>
</view> </view>
</view> </view>
</view> </view>
<view>
<text class="iconfont icon-jinggao1"></text>
<text class="tt">已绑定</text>
</view>
</view>
<view class="list column"> <view class="list column">
<view class="box row bothSide verCenter"> <view class="box row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
<text class="iconfont icon-riqi2"></text> <text class="iconfont icon-juxing1"></text>
<text class="tt">绑定邮箱</text> <text class="tt">所属部门</text>
</view>
<view class="text">{{ userData.email }}</view>
</view>
<view class="box row bothSide verCenter">
<view class="row verCenter">
<text class="iconfont icon-a-riqi12"></text>
<text class="tt">签约状态</text>
</view>
<view class="text">{{ userData.is_sign }}</view>
</view>
<view class="box row bothSide verCenter" v-if="userData.user_follow_people.qq">
<view class="row verCenter">
<text class="iconfont icon-a-riqi2"></text>
<text class="tt">我的业务</text>
</view>
<view class="text">{{ userData.user_follow_people.name }} {{ userData.user_follow_people.qq }}</view>
</view>
<view class="box row bothSide verCenter" v-if="userData.user_follow_people.yw_qq">
<view class="row verCenter">
<text class="iconfont icon-a-riqi2"></text>
<text class="tt">我的商务</text>
</view> </view>
<view class="text">{{ userData.user_follow_people.yw_name }} {{ userData.user_follow_people.yw_qq }}</view> <view class="text">仓储部门 -工号0005</view>
</view> </view>
</view> </view>
<view class="exit row rowCenter verCenter" @click="exit()">退出账号</view> <view class="exit row rowCenter verCenter" @click="exit()">退出账号</view>
...@@ -95,11 +57,11 @@ export default { ...@@ -95,11 +57,11 @@ export default {
}, },
methods: { methods: {
getData() { getData() {
this.request(API.UserInfo, 'POST', {}, false).then(res => { this.request(API.userInfo, 'POST', {}, false).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
this.userData = res.data; this.userData = res.data;
this.isLogin = true; this.isLogin = true;
}else{ } else {
this.isLogin = false; this.isLogin = false;
} }
}); });
...@@ -117,7 +79,7 @@ export default { ...@@ -117,7 +79,7 @@ export default {
if (res.confirm) { if (res.confirm) {
uni.removeStorageSync('token'); uni.removeStorageSync('token');
uni.switchTab({ uni.switchTab({
url: '/pages/order/index' url: '/pages/home/index'
}); });
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
......
pages/scan/confirm.vue 0 → 100644
<template>
<view class="scan-confirm">
<view class="form-box">
<view class="wrap column">
<view class="tit row verCenter">
<text class="arrow"></text>
<text class="tt">收货信息</text>
</view>
<view class="box row bothSide verCenter">
<text class="left-text">发货单号</text>
<text class="right-text">SFH1000000003</text>
</view>
<view class="box row bothSide verCenter bor">
<text class="left-text">发货类型</text>
<text class="right-text">快递物流</text>
</view>
<view class="box row bothSide verCenter">
<text class="left-text">签单图片上传</text>
<text class="right-text">1/4</text>
</view>
<view class="pic-list row">
<view class="pp">
<image src="http://img.ichunt.com/images/ichunt/minProgram/scm/1c264737141e2c941732cac71bc6a5ca.jpg" mode="aspectFill" lazy-load="true"></image>
</view>
<view class="pp">
<image src="http://img.ichunt.com/images/ichunt/minProgram/scm/1c264737141e2c941732cac71bc6a5ca.jpg" mode="aspectFill" lazy-load="true"></image>
</view>
<view class="pp">
<image src="http://img.ichunt.com/images/ichunt/minProgram/scm/1c264737141e2c941732cac71bc6a5ca.jpg" mode="aspectFill" lazy-load="true"></image>
</view>
<view class="default"></view>
</view>
<textarea class="remark row" placeholder="请输入签单备注"></textarea>
</view>
</view>
<view class="btn row rowCenter verCenter">提交确认</view>
</view>
</template>
<script>
import { API } from '@/util/api.js';
export default {
data() {
return {};
},
onLoad() {},
onShow() {
this.getData();
},
methods: {
getData() {
this.request(API.OrderList, 'GET', { limit: this.limit }, this.loading).then(res => {});
}
}
};
</script>
<style scoped lang="scss">
@import '../../assets/css/scan/confirm.scss';
</style>
static/iconfont.ttf
No preview for this file type
util/api.js
//const API_BASE = 'https://api.ichunt.com'; const API_BASE = 'https://api.ichunt.com';
const API_BASE = 'http://supplyapi.liexin.com' //const API_BASE = 'http://supplyapi.liexin.com'
const API = { const API = {
/** /**
* 绑定微信号 * 绑定微信号
...@@ -12,7 +12,7 @@ const API = { ...@@ -12,7 +12,7 @@ const API = {
/** /**
* 会员中心获取 * 会员中心获取
* */ * */
UserInfo: API_BASE + '/supplywechatorder/userInfo', userInfo: API_BASE + '/supplywechatorder/userInfo',
/** /**
* 小程序登录 * 小程序登录
* */ * */
...@@ -20,48 +20,7 @@ const API = { ...@@ -20,48 +20,7 @@ const API = {
/** /**
* 公告信息获取 * 公告信息获取
* */ * */
GetNotice: API_BASE + '/supplywechat/getNotice', GetNotice: API_BASE + '/supplywechat/getNotice'
/**
* 订单列表
* */
OrderList: API_BASE + '/supplywechatorder/orderList',
/**
* 订单详情
* */
OrderDetail: API_BASE + '/supplywechatorder/orderDetail',
/**
* 获取物流信息
* */
GetOrderlogistics: API_BASE + '/supplywechatorder/getOrderlogistics',
/**
* 获取供应商
* */
GetUserSuppliers: API_BASE + '/supplywechatorder/getUserSuppliers',
/**
* 获取币别
* */
Getcurrency: API_BASE + '/supplywechatorder/getcurrency',
/**
* 获取付汇申请
* */
WaitApplyPaymentList: API_BASE + '/supplywechatorder/waitApplyPaymentList',
/**
* 费用明细列表
* */
ApplyPaymentList: API_BASE + '/supplywechatorder/applyPaymentList',
/**
* 费用明细详情
* */
ApplyPaymentDetails: API_BASE + '/supplywechatorder/applyPaymentDetails',
/**
* 付款列表
* */
GetPaymentList: API_BASE + '/supplywechatorder/getPaymentList',
/**
* 付款详情
* */
GetPaymentDetails: API_BASE + '/supplywechatorder/getPaymentDetails'
} }
......
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